update ISBN range messages, update Gradle to 6.6.1

gradle.properties

@@ -1,6 +1,5 @@
 group = org.xbib
 name = standardnumber
-version = 1.1.0
+version = 1.2.0
-
-gradle.wrapper.version = 6.4.1
 
+gradle.wrapper.version = 6.6.1

gradle/test/junit5.gradle

@@ -1,5 +1,5 @@
 
-def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
+def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.7.1'
 def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
 
 dependencies {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/module-info.java

@@ -2,5 +2,5 @@ module org.xbib.standardnumber {
     exports org.xbib.standardnumber;
     exports org.xbib.standardnumber.checksum;
     exports org.xbib.standardnumber.checksum.iso7064;
-    requires java.xml; // for reading ISBN config file
+    requires java.xml; // for reading ISBN range message file
 }

src/main/resources/org/xbib/standardnumber/RangeMessage.xml

@@ -1,24 +1,9 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ISBNRangeMessage [
+<!DOCTYPE ISBNRangeMessage>
-<!ELEMENT ISBNRangeMessage (MessageSource?, MessageSerialNumber?, MessageDate, EAN.UCCPrefixes, RegistrationGroups) >
-<!ELEMENT MessageSource (#PCDATA) >
-<!ELEMENT MessageSerialNumber (#PCDATA) >
-<!ELEMENT MessageDate (#PCDATA) >
-<!ELEMENT EAN.UCCPrefixes (EAN.UCC+) >
-<!ELEMENT RegistrationGroups (Group+) >
-<!ELEMENT EAN.UCC (Prefix, Agency, Rules) >
-<!ELEMENT Group (Prefix, Agency, Rules) >
-<!ELEMENT Rules (Rule+) >
-<!ELEMENT Rule (Range, Length) >
-<!ELEMENT Prefix (#PCDATA) >
-<!ELEMENT Agency (#PCDATA) >
-<!ELEMENT Range (#PCDATA) >
-<!ELEMENT Length (#PCDATA) >
-]>
 <ISBNRangeMessage>
   <MessageSource>International ISBN Agency</MessageSource>
-  <MessageSerialNumber>0bd46fe8-fe65-4ede-a20f-8741c3163616</MessageSerialNumber>
+  <MessageSerialNumber>94ba3de4-a08d-46c1-b2a8-5ca376c7eba2</MessageSerialNumber>
-  <MessageDate>Mon, 8 Jun 2020 10:00:16 CEST</MessageDate>
+  <MessageDate>Thu, 22 Apr 2021 08:57:16 BST</MessageDate>
   <EAN.UCCPrefixes>
     <EAN.UCC>
       <Prefix>978</Prefix>
@@ -127,7 +112,15 @@
           <Length>7</Length>
         </Rule>
         <Rule>
-          <Range>6400000-6479999</Range>
+          <Range>6400000-6449999</Range>
+          <Length>3</Length>
+        </Rule>
+        <Rule>
+          <Range>6450000-6459999</Range>
+          <Length>7</Length>
+        </Rule>
+        <Rule>
+          <Range>6460000-6479999</Range>
           <Length>3</Length>
         </Rule>
         <Rule>
@@ -249,11 +242,11 @@
           <Length>5</Length>
         </Rule>
         <Rule>
-          <Range>7770000-7776999</Range>
+          <Range>7770000-7782999</Range>
           <Length>7</Length>
         </Rule>
         <Rule>
-          <Range>7777000-7899999</Range>
+          <Range>7783000-7899999</Range>
           <Length>5</Length>
         </Rule>
         <Rule>
@@ -297,7 +290,15 @@
           <Length>7</Length>
         </Rule>
         <Rule>
-          <Range>9165060-9729999</Range>
+          <Range>9165060-9168699</Range>
+          <Length>6</Length>
+        </Rule>
+        <Rule>
+          <Range>9168700-9169079</Range>
+          <Length>7</Length>
+        </Rule>
+        <Rule>
+          <Range>9169080-9729999</Range>
           <Length>6</Length>
         </Rule>
         <Rule>
@@ -305,7 +306,15 @@
           <Length>4</Length>
         </Rule>
         <Rule>
-          <Range>9878000-9989899</Range>
+          <Range>9878000-9911499</Range>
+          <Length>6</Length>
+        </Rule>
+        <Rule>
+          <Range>9911500-9911999</Range>
+          <Length>7</Length>
+        </Rule>
+        <Rule>
+          <Range>9912000-9989899</Range>
           <Length>6</Length>
         </Rule>
         <Rule>
@@ -753,7 +762,15 @@
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>0400000-0999999</Range>
+          <Range>0400000-0599999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>0600000-0699999</Range>
+          <Length>5</Length>
+        </Rule>
+        <Rule>
+          <Range>0700000-0999999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
@@ -795,11 +812,11 @@
       <Agency>Romania</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-0899999</Range>
+          <Range>0000000-0999999</Range>
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>0900000-4999999</Range>
+          <Range>1000000-4999999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
@@ -815,11 +832,11 @@
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>9200000-9649999</Range>
+          <Range>9200000-9599999</Range>
           <Length>5</Length>
         </Rule>
         <Rule>
-          <Range>9650000-9749999</Range>
+          <Range>9600000-9749999</Range>
           <Length>4</Length>
         </Rule>
         <Rule>
@@ -933,8 +950,12 @@
           <Length>5</Length>
         </Rule>
         <Rule>
-          <Range>5000000-9999999</Range>
+          <Range>5000000-5149999</Range>
-          <Length>2</Length>
+          <Length>4</Length>
+        </Rule>
+        <Rule>
+          <Range>5150000-9999999</Range>
+          <Length>0</Length>
         </Rule>
       </Rules>
     </Group>
@@ -1149,11 +1170,11 @@
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>6000000-7499999</Range>
+          <Range>6000000-7999999</Range>
           <Length>4</Length>
         </Rule>
         <Rule>
-          <Range>7500000-9499999</Range>
+          <Range>8000000-9499999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
@@ -1175,15 +1196,15 @@
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>2000000-2999999</Range>
+          <Range>2000000-3999999</Range>
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>3000000-6499999</Range>
+          <Range>4000000-5999999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>6500000-7999999</Range>
+          <Range>6000000-7999999</Range>
           <Length>4</Length>
         </Rule>
         <Rule>
@@ -1260,6 +1281,74 @@
         </Rule>
       </Rules>
     </Group>
+    <Group>
+      <Prefix>978-626</Prefix>
+      <Agency>Taiwan</Agency>
+      <Rules>
+        <Rule>
+          <Range>0000000-0499999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>0500000-2999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>3000000-4999999</Range>
+          <Length>3</Length>
+        </Rule>
+        <Rule>
+          <Range>5000000-6999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>7000000-7999999</Range>
+          <Length>4</Length>
+        </Rule>
+        <Rule>
+          <Range>8000000-9499999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>9500000-9999999</Range>
+          <Length>5</Length>
+        </Rule>
+      </Rules>
+    </Group>
+    <Group>
+      <Prefix>978-627</Prefix>
+      <Agency>Pakistan</Agency>
+      <Rules>
+        <Rule>
+          <Range>0000000-2999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>3000000-3199999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>3200000-4999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>5000000-5249999</Range>
+          <Length>3</Length>
+        </Rule>
+        <Rule>
+          <Range>5250000-7499999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>7500000-7999999</Range>
+          <Length>4</Length>
+        </Rule>
+        <Rule>
+          <Range>8000000-9999999</Range>
+          <Length>0</Length>
+        </Rule>
+      </Rules>
+    </Group>
     <Group>
       <Prefix>978-65</Prefix>
       <Agency>Brazil</Agency>
@@ -1473,9 +1562,13 @@
       <Agency>Spain</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-1199999</Range>
+          <Range>0000000-1099999</Range>
           <Length>2</Length>
         </Rule>
+        <Rule>
+          <Range>1100000-1199999</Range>
+          <Length>4</Length>
+        </Rule>
         <Rule>
           <Range>1200000-1299999</Range>
           <Length>6</Length>
@@ -2295,9 +2388,13 @@
       <Agency>Colombia</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-5099999</Range>
+          <Range>0000000-4899999</Range>
           <Length>2</Length>
         </Rule>
+        <Rule>
+          <Range>4900000-5099999</Range>
+          <Length>3</Length>
+        </Rule>
         <Rule>
           <Range>5100000-5199999</Range>
           <Length>4</Length>
@@ -2629,11 +2726,11 @@
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>2550000-2899999</Range>
+          <Range>2550000-2799999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>2900000-2999999</Range>
+          <Range>2800000-2999999</Range>
           <Length>4</Length>
         </Rule>
         <Rule>
@@ -2697,9 +2794,17 @@
           <Length>1</Length>
         </Rule>
         <Rule>
-          <Range>2000000-2299999</Range>
+          <Range>2000000-2099999</Range>
           <Length>2</Length>
         </Rule>
+        <Rule>
+          <Range>2100000-2199999</Range>
+          <Length>3</Length>
+        </Rule>
+        <Rule>
+          <Range>2200000-2299999</Range>
+          <Length>4</Length>
+        </Rule>
         <Rule>
           <Range>2300000-2399999</Range>
           <Length>5</Length>
@@ -3223,7 +3328,19 @@
       <Agency>Taiwan</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-1199999</Range>
+          <Range>0000000-0599999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>0600000-0699999</Range>
+          <Length>5</Length>
+        </Rule>
+        <Rule>
+          <Range>0700000-0799999</Range>
+          <Length>4</Length>
+        </Rule>
+        <Rule>
+          <Range>0800000-1199999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
@@ -3349,11 +3466,19 @@
           <Length>1</Length>
         </Rule>
         <Rule>
-          <Range>2000000-5399999</Range>
+          <Range>2000000-3499999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
-          <Range>5400000-5499999</Range>
+          <Range>3500000-3699999</Range>
+          <Length>5</Length>
+        </Rule>
+        <Rule>
+          <Range>3700000-5299999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>5300000-5499999</Range>
           <Length>5</Length>
         </Rule>
         <Rule>
@@ -3567,27 +3692,27 @@
       <Agency>Morocco</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-3499999</Range>
+          <Range>0000000-3199999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>3500000-3999999</Range>
+          <Range>3200000-3999999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
-          <Range>4000000-5999999</Range>
+          <Range>4000000-5499999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>6000000-7999999</Range>
+          <Range>5500000-7999999</Range>
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>8000000-9299999</Range>
+          <Range>8000000-8999999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>9300000-9999999</Range>
+          <Range>9000000-9999999</Range>
           <Length>4</Length>
         </Rule>
       </Rules>
@@ -5257,11 +5382,11 @@
       <Agency>Ghana</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-2999999</Range>
+          <Range>0000000-3999999</Range>
           <Length>1</Length>
         </Rule>
         <Rule>
-          <Range>3000000-5499999</Range>
+          <Range>4000000-5499999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
@@ -5755,7 +5880,19 @@
       <Agency>Paraguay</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-3999999</Range>
+          <Range>0000000-0999999</Range>
+          <Length>1</Length>
+        </Rule>
+        <Rule>
+          <Range>1000000-1999999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>2000000-2999999</Range>
+          <Length>3</Length>
+        </Rule>
+        <Rule>
+          <Range>3000000-3999999</Range>
           <Length>1</Length>
         </Rule>
         <Rule>
@@ -6035,9 +6172,13 @@
       <Agency>Guatemala</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-5999999</Range>
+          <Range>0000000-2999999</Range>
           <Length>1</Length>
         </Rule>
+        <Rule>
+          <Range>3000000-5999999</Range>
+          <Length>2</Length>
+        </Rule>
         <Rule>
           <Range>6000000-8999999</Range>
           <Length>2</Length>
@@ -6143,11 +6284,11 @@
       <Agency>Namibia</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-5999999</Range>
+          <Range>0000000-4999999</Range>
           <Length>1</Length>
         </Rule>
         <Rule>
-          <Range>6000000-8999999</Range>
+          <Range>5000000-8999999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
@@ -6883,11 +7024,11 @@
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>3000000-4999999</Range>
+          <Range>3000000-5999999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
-          <Range>5000000-7999999</Range>
+          <Range>6000000-7999999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
@@ -6909,19 +7050,19 @@
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>5000000-6299999</Range>
+          <Range>5000000-6599999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
-          <Range>6300000-8999999</Range>
+          <Range>6600000-8999999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>9000000-9699999</Range>
+          <Range>9000000-9799999</Range>
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>9700000-9999999</Range>
+          <Range>9800000-9999999</Range>
           <Length>0</Length>
         </Rule>
       </Rules>
@@ -6957,15 +7098,19 @@
       <Agency>Tajikistan</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-5499999</Range>
+          <Range>0000000-1999999</Range>
+          <Length>1</Length>
+        </Rule>
+        <Rule>
+          <Range>2000000-4999999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>5500000-5999999</Range>
+          <Range>5000000-6499999</Range>
           <Length>2</Length>
         </Rule>
         <Rule>
-          <Range>6000000-9499999</Range>
+          <Range>6500000-9499999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
@@ -6974,6 +7119,76 @@
         </Rule>
       </Rules>
     </Group>
+    <Group>
+      <Prefix>978-99986</Prefix>
+      <Agency>Myanmar</Agency>
+      <Rules>
+        <Rule>
+          <Range>0000000-0999999</Range>
+          <Length>1</Length>
+        </Rule>
+        <Rule>
+          <Range>1000000-4999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>5000000-6999999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>7000000-9499999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>9500000-9999999</Range>
+          <Length>3</Length>
+        </Rule>
+      </Rules>
+    </Group>
+    <Group>
+      <Prefix>978-99987</Prefix>
+      <Agency>Luxembourg</Agency>
+      <Rules>
+        <Rule>
+          <Range>0000000-8499999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>8500000-9999999</Range>
+          <Length>3</Length>
+        </Rule>
+      </Rules>
+    </Group>
+    <Group>
+      <Prefix>978-99988</Prefix>
+      <Agency>Sudan</Agency>
+      <Rules>
+        <Rule>
+          <Range>0000000-0999999</Range>
+          <Length>1</Length>
+        </Rule>
+        <Rule>
+          <Range>1000000-4999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>5000000-5499999</Range>
+          <Length>2</Length>
+        </Rule>
+        <Rule>
+          <Range>5500000-7999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>8000000-8249999</Range>
+          <Length>3</Length>
+        </Rule>
+        <Rule>
+          <Range>8250000-9999999</Range>
+          <Length>0</Length>
+        </Rule>
+      </Rules>
+    </Group>
     <Group>
       <Prefix>979-10</Prefix>
       <Agency>France</Agency>
@@ -7039,7 +7254,15 @@
           <Length>3</Length>
         </Rule>
         <Rule>
-          <Range>3000000-7999999</Range>
+          <Range>3000000-5949999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>5950000-5999999</Range>
+          <Length>4</Length>
+        </Rule>
+        <Rule>
+          <Range>6000000-7999999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
@@ -7057,15 +7280,23 @@
       <Agency>United States</Agency>
       <Rules>
         <Rule>
-          <Range>0000000-5999999</Range>
+          <Range>0000000-1999999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>
-          <Range>6000000-6999999</Range>
+          <Range>2000000-2199999</Range>
+          <Length>3</Length>
+        </Rule>
+        <Rule>
+          <Range>2200000-4999999</Range>
+          <Length>0</Length>
+        </Rule>
+        <Rule>
+          <Range>5000000-7499999</Range>
           <Length>4</Length>
         </Rule>
         <Rule>
-          <Range>7000000-9849999</Range>
+          <Range>7500000-9849999</Range>
           <Length>0</Length>
         </Rule>
         <Rule>