Merge branch 'master' into stable

claeis · Feb 22, 2023 · cef7100 · cef7100
2 parents 6e495d6 + 4920fa7
commit cef7100
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,6 @@ deploy:
       branch: master
   - provider: script
     skip_cleanup: true
-    script: ./gradlew -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE '-Drelease=' -Ddownloads_pwd=${downloads_pwd} -Ddownloads_usr=jql_downloads uploadArchives uploadBin
+    script: ./gradlew -Dgithub_token=${github_token} -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE '-Drelease=' -Ddownloads_pwd=${downloads_pwd} -Ddownloads_usr=jql_downloads uploadArchives uploadBin
     on:
       branch: stable
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ allprojects {
 	compileJava.options.encoding = 'US-ASCII'
 }
 
-version '1.13.1'+System.getProperty('release','-SNAPSHOT')
+version '1.13.2'+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.16'
+    compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.17'
     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.2 (2023-02-22)
+--------------------------------
+- Validator: PlausibilityConstraint: add calculated value to log (ilivalidator#367)
+- Validator: fix LIST OF / BAG OF NumericType
+- Validator: fix  xtflog duplicate coord shows different coordinates in <message> and <geometry> (ilivalidator#353)
+- iox-ili-1.21.17
+
 ilivalidator 1.13.1 (2023-01-23)
 --------------------------------
 - ILI2.4 support LIST OF / BAG OF primitive type (#348)