diff --git a/gradle.properties b/gradle.properties index bc64163..091f2b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ group = org.xbib name = standardnumber -version = 1.1.0 - -gradle.wrapper.version = 6.4.1 +version = 1.2.0 +gradle.wrapper.version = 6.6.1 diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index cfef972..bbfa201 100644 --- a/gradle/test/junit5.gradle +++ b/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 { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 21e622d..33682bb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index fbd7c51..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index a9f778a..ac1b06f 100644 --- a/gradlew.bat +++ b/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 diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index acb5895..4108b1d 100644 --- a/src/main/java/module-info.java +++ b/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 } diff --git a/src/main/resources/org/xbib/standardnumber/RangeMessage.xml b/src/main/resources/org/xbib/standardnumber/RangeMessage.xml index 7bc02ba..b89ff40 100644 --- a/src/main/resources/org/xbib/standardnumber/RangeMessage.xml +++ b/src/main/resources/org/xbib/standardnumber/RangeMessage.xml @@ -1,24 +1,9 @@ - - - - - - - - - - - - - - - -]> + + International ISBN Agency - 0bd46fe8-fe65-4ede-a20f-8741c3163616 - Mon, 8 Jun 2020 10:00:16 CEST + 94ba3de4-a08d-46c1-b2a8-5ca376c7eba2 + Thu, 22 Apr 2021 08:57:16 BST 978 @@ -127,7 +112,15 @@ 7 - 6400000-6479999 + 6400000-6449999 + 3 + + + 6450000-6459999 + 7 + + + 6460000-6479999 3 @@ -249,11 +242,11 @@ 5 - 7770000-7776999 + 7770000-7782999 7 - 7777000-7899999 + 7783000-7899999 5 @@ -297,7 +290,15 @@ 7 - 9165060-9729999 + 9165060-9168699 + 6 + + + 9168700-9169079 + 7 + + + 9169080-9729999 6 @@ -305,7 +306,15 @@ 4 - 9878000-9989899 + 9878000-9911499 + 6 + + + 9911500-9911999 + 7 + + + 9912000-9989899 6 @@ -753,7 +762,15 @@ 3 - 0400000-0999999 + 0400000-0599999 + 2 + + + 0600000-0699999 + 5 + + + 0700000-0999999 2 @@ -795,11 +812,11 @@ Romania - 0000000-0899999 + 0000000-0999999 3 - 0900000-4999999 + 1000000-4999999 2 @@ -815,11 +832,11 @@ 3 - 9200000-9649999 + 9200000-9599999 5 - 9650000-9749999 + 9600000-9749999 4 @@ -933,8 +950,12 @@ 5 - 5000000-9999999 - 2 + 5000000-5149999 + 4 + + + 5150000-9999999 + 0 @@ -1149,11 +1170,11 @@ 0 - 6000000-7499999 + 6000000-7999999 4 - 7500000-9499999 + 8000000-9499999 0 @@ -1175,15 +1196,15 @@ 0 - 2000000-2999999 + 2000000-3999999 3 - 3000000-6499999 + 4000000-5999999 0 - 6500000-7999999 + 6000000-7999999 4 @@ -1260,6 +1281,74 @@ + + 978-626 + Taiwan + + + 0000000-0499999 + 2 + + + 0500000-2999999 + 0 + + + 3000000-4999999 + 3 + + + 5000000-6999999 + 0 + + + 7000000-7999999 + 4 + + + 8000000-9499999 + 0 + + + 9500000-9999999 + 5 + + + + + 978-627 + Pakistan + + + 0000000-2999999 + 0 + + + 3000000-3199999 + 2 + + + 3200000-4999999 + 0 + + + 5000000-5249999 + 3 + + + 5250000-7499999 + 0 + + + 7500000-7999999 + 4 + + + 8000000-9999999 + 0 + + + 978-65 Brazil @@ -1473,9 +1562,13 @@ Spain - 0000000-1199999 + 0000000-1099999 2 + + 1100000-1199999 + 4 + 1200000-1299999 6 @@ -2078,7 +2171,7 @@ 978-953 - Croatia + Croatia 0000000-0999999 @@ -2295,9 +2388,13 @@ Colombia - 0000000-5099999 + 0000000-4899999 2 + + 4900000-5099999 + 3 + 5100000-5199999 4 @@ -2629,11 +2726,11 @@ 3 - 2550000-2899999 + 2550000-2799999 0 - 2900000-2999999 + 2800000-2999999 4 @@ -2697,9 +2794,17 @@ 1 - 2000000-2299999 + 2000000-2099999 2 + + 2100000-2199999 + 3 + + + 2200000-2299999 + 4 + 2300000-2399999 5 @@ -3223,7 +3328,19 @@ Taiwan - 0000000-1199999 + 0000000-0599999 + 2 + + + 0600000-0699999 + 5 + + + 0700000-0799999 + 4 + + + 0800000-1199999 2 @@ -3349,11 +3466,19 @@ 1 - 2000000-5399999 + 2000000-3499999 2 - 5400000-5499999 + 3500000-3699999 + 5 + + + 3700000-5299999 + 2 + + + 5300000-5499999 5 @@ -3567,27 +3692,27 @@ Morocco - 0000000-3499999 + 0000000-3199999 0 - 3500000-3999999 + 3200000-3999999 2 - 4000000-5999999 + 4000000-5499999 0 - 6000000-7999999 + 5500000-7999999 3 - 8000000-9299999 + 8000000-8999999 0 - 9300000-9999999 + 9000000-9999999 4 @@ -5257,11 +5382,11 @@ Ghana - 0000000-2999999 + 0000000-3999999 1 - 3000000-5499999 + 4000000-5499999 2 @@ -5755,7 +5880,19 @@ Paraguay - 0000000-3999999 + 0000000-0999999 + 1 + + + 1000000-1999999 + 2 + + + 2000000-2999999 + 3 + + + 3000000-3999999 1 @@ -6035,9 +6172,13 @@ Guatemala - 0000000-5999999 + 0000000-2999999 1 + + 3000000-5999999 + 2 + 6000000-8999999 2 @@ -6143,11 +6284,11 @@ Namibia - 0000000-5999999 + 0000000-4999999 1 - 6000000-8999999 + 5000000-8999999 2 @@ -6883,11 +7024,11 @@ 0 - 3000000-4999999 + 3000000-5999999 2 - 5000000-7999999 + 6000000-7999999 0 @@ -6909,19 +7050,19 @@ 0 - 5000000-6299999 + 5000000-6599999 2 - 6300000-8999999 + 6600000-8999999 0 - 9000000-9699999 + 9000000-9799999 3 - 9700000-9999999 + 9800000-9999999 0 @@ -6957,15 +7098,19 @@ Tajikistan - 0000000-5499999 + 0000000-1999999 + 1 + + + 2000000-4999999 0 - 5500000-5999999 + 5000000-6499999 2 - 6000000-9499999 + 6500000-9499999 0 @@ -6974,6 +7119,76 @@ + + 978-99986 + Myanmar + + + 0000000-0999999 + 1 + + + 1000000-4999999 + 0 + + + 5000000-6999999 + 2 + + + 7000000-9499999 + 0 + + + 9500000-9999999 + 3 + + + + + 978-99987 + Luxembourg + + + 0000000-8499999 + 0 + + + 8500000-9999999 + 3 + + + + + 978-99988 + Sudan + + + 0000000-0999999 + 1 + + + 1000000-4999999 + 0 + + + 5000000-5499999 + 2 + + + 5500000-7999999 + 0 + + + 8000000-8249999 + 3 + + + 8250000-9999999 + 0 + + + 979-10 France @@ -7039,7 +7254,15 @@ 3 - 3000000-7999999 + 3000000-5949999 + 0 + + + 5950000-5999999 + 4 + + + 6000000-7999999 0 @@ -7057,15 +7280,23 @@ United States - 0000000-5999999 + 0000000-1999999 0 - 6000000-6999999 + 2000000-2199999 + 3 + + + 2200000-4999999 + 0 + + + 5000000-7499999 4 - 7000000-9849999 + 7500000-9849999 0 @@ -7079,4 +7310,4 @@ - + \ No newline at end of file