Merge branch 'master' into stable

claeis · Apr 24, 2023 · a83faf2 · a83faf2
2 parents cef7100 + b67ed60
commit a83faf2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ allprojects {
 	compileJava.options.encoding = 'US-ASCII'
 }
 
-version '1.13.2'+System.getProperty('release','-SNAPSHOT')
+version '1.13.3'+System.getProperty('release','-SNAPSHOT')
 
 configurations {
     deployerJars
@@ -24,7 +24,7 @@ configurations {
 dependencies {
     compile group: 'ch.ehi', name: 'ehibasics', version: '1.4.1'
     compile group: 'ch.interlis', name: 'iox-api', version: '1.0.4'
-    compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.17'
+    compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.18'
     compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.3.2"
     compile group: 'ch.interlis', name: 'ili2c-core', version: "5.3.2"
     testCompile group: 'junit', name: 'junit', version: '4.12'

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -1,3 +1,10 @@
+ilivalidator 1.13.3 (2023-04-24)
+--------------------------------
+- fix UNIQUE mixed case INTERLIS.UUIDOID (ilivalidator#371)
+- fix references with mixed case INTERLIS.UUIDOID (ilivalidator#370)
+- log/report JRE Version (ilivalidator#369)
+- iox-ili-1.21.18
+
 ilivalidator 1.13.2 (2023-02-22)
 --------------------------------
 - Validator: PlausibilityConstraint: add calculated value to log (ilivalidator#367)

diff --git a/src/org/interlis2/validator/Validator.java b/src/org/interlis2/validator/Validator.java
@@ -157,6 +157,7 @@ public boolean validate(
 			EhiLogger.logState(Main.APP_NAME+"-"+Main.getVersion());
 			EhiLogger.logState("ili2c-"+ch.interlis.ili2c.Ili2c.getVersion());
 			EhiLogger.logState("iox-ili-"+ch.interlis.iox_j.utility.IoxUtility.getVersion());
+			EhiLogger.logState("java.version "+System.getProperty("java.version"));
             EhiLogger.logState("User <"+java.lang.System.getProperty("user.name")+">");
             String DATE_FORMAT = "yyyy-MM-dd HH:mm";
             SimpleDateFormat dateFormat = new java.text.SimpleDateFormat(DATE_FORMAT);