Merge branch 'master' into stable

claeis · Dec 23, 2019 · 0de2d60 · 0de2d60
2 parents ee408ed + 5c8ebcf
commit 0de2d60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ allprojects {
 	targetCompatibility = "1.6"
 }
 
-version '1.11.2'+System.getProperty('release','-SNAPSHOT')
+version '1.11.3'+System.getProperty('release','-SNAPSHOT')
 
 configurations {
     deployerJars
@@ -20,7 +20,7 @@ configurations {
 //}
 
 dependencies {
-    compile group: 'ch.interlis', name: 'iox-ili', version: '1.20.14'
+    compile group: 'ch.interlis', name: 'iox-ili', version: '1.20.15'
     compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.0.2"
     compile group: 'ch.interlis', name: 'ili2c-core', version: "5.0.2"
     testCompile group: 'junit', name: 'junit', version: '4.12'

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -1,6 +1,13 @@
 LATEST VERSION
 -----------------------------
 
+ilivalidator 1.11.3 (2019-12-23)
+-----------------------------
+- Unable to detect out model name for ili22 (#214)
+- NPE when reference to main table is missing in surface table (ili1) (#213)
+- Error: polygons overlay (#202)
+- iox-ili-1.20.15
+
 ilivalidator 1.11.2 (2019-11-08)
 -----------------------------
 - fix objectCount(UNDEFINED) (#203)