From c7aca798a01ff914de5fe6cab50a33743c43a45f Mon Sep 17 00:00:00 2001 From: claeis Date: Fri, 30 Dec 2022 11:19:08 +0100 Subject: [PATCH 1/5] start 1.13.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 324eefb..6a7e4ce 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ allprojects { compileJava.options.encoding = 'US-ASCII' } -version '1.13.0'+System.getProperty('release','-SNAPSHOT') +version '1.13.1'+System.getProperty('release','-SNAPSHOT') configurations { deployerJars From 1f258396d5cd0721498eb9f4c6b108118b236137 Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 11 Jan 2023 20:21:54 +0100 Subject: [PATCH 2/5] iox-ili-1.21.16-SNAPSHOT --- build.gradle | 2 +- docs/CHANGELOG.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6a7e4ce..031e11a 100644 --- a/build.gradle +++ b/build.gradle @@ -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.15' + compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.16+' 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 index 4127673..2d6c9cf 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,5 +1,11 @@ LATEST VERSION ----------------------------- +- Validator: ILI2.4 support LIST OF / BAG OF primitive type (#348) +- Validator: ILI2.4 Vereinfachung des Umgangs mit Zeit (#349) +- Validator: ILI2.4 MULTI-Geometrien (#347) +- Validator: ILI2.4 validate MultiArea/MultiSurface topology (#347) +- Validator: skip polygon topology validation if basic checks fail +- iox-ili-1.21.16-SNAPSHOT ilivalidator 1.13.0 (2022-12-30) ----------------------------- From 8b0b7a9d438888ab0479e26f5222af5ac4e6f668 Mon Sep 17 00:00:00 2001 From: claeis Date: Mon, 16 Jan 2023 16:19:51 +0100 Subject: [PATCH 3/5] A TRANSLATION OF model must not define new types, but only an alternative transfer format (#361) --- docs/CHANGELOG.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 2d6c9cf..e2c3884 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,10 +1,11 @@ LATEST VERSION ----------------------------- -- Validator: ILI2.4 support LIST OF / BAG OF primitive type (#348) -- Validator: ILI2.4 Vereinfachung des Umgangs mit Zeit (#349) -- Validator: ILI2.4 MULTI-Geometrien (#347) -- Validator: ILI2.4 validate MultiArea/MultiSurface topology (#347) -- Validator: skip polygon topology validation if basic checks fail +- ILI2.4 support LIST OF / BAG OF primitive type (#348) +- ILI2.4 Vereinfachung des Umgangs mit Zeit (#349) +- ILI2.4 MULTI-Geometrien (#347) +- ILI2.4 validate MultiArea/MultiSurface topology (#347) +- A TRANSLATION OF model must not define new types, but only an alternative transfer format (#361) +- skip polygon topology validation if basic checks fail - iox-ili-1.21.16-SNAPSHOT ilivalidator 1.13.0 (2022-12-30) From aee9ceabeee36fba1b662a6ce0ab6e07a692697a Mon Sep 17 00:00:00 2001 From: claeis Date: Mon, 23 Jan 2023 11:00:01 +0100 Subject: [PATCH 4/5] flag git tags as github release (#330) --- build.gradle | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/build.gradle b/build.gradle index 031e11a..b84b171 100644 --- a/build.gradle +++ b/build.gradle @@ -56,6 +56,7 @@ def downloads_pwd = System.getProperty('downloads_pwd',properties.get('downloads def downloads_usr = System.getProperty('downloads_usr',properties.get('downloads_usr','downloads_usr')) def python= System.getProperty('python',properties.get('python','python')) def rst2html= System.getProperty('rst2html',properties.get('rst2html','rst2html')) +def github_token= System.getProperty('github_token',properties.get('github_token','github_token')) def generatedResources = "$buildDir/generated-resources/main" @@ -107,6 +108,58 @@ task generateMyResources { } } +def readChangeLog = { -> + def resp="" + def skip=false + def sec=0 + new File("docs/CHANGELOG.txt").eachLine { line -> + if(line.startsWith("-------")){ + sec++ + }else{ + if(sec==1){ + if(skip){ + }else{ + if(line.trim()==""){ + skip=true + }else{ + resp+=line+"\n" + } + } + } + } + } + return resp +} +task readChanges { + doLast { + logger.quiet "----" + logger.quiet readChangeLog() + logger.quiet "----" + } +} +def createGithubReleaseFunc = { -> + def body = [tag_name:"$project.name-$project.version",name:"$project.name-$project.version",body:readChangeLog(),draft:false,prerelease:false,generate_release_notes:false] + def req = new URL("https://api.github.com/repos/claeis/$project.name/releases").openConnection() + req.setRequestMethod("POST") + req.setRequestProperty("Content-Type", "application/json; charset=UTF-8") + req.setRequestProperty("Accept", "application/vnd.github+json") + req.setRequestProperty("Authorization", "Bearer $github_token") + req.setRequestProperty("X-GitHub-Api-Version", "2022-11-28") + req.setDoOutput(true) + req.getOutputStream().write(groovy.json.JsonOutput.toJson(body).getBytes("UTF-8")) + if(req.getResponseCode()!=201){ + logger.quiet "Status code: ${req.getResponseCode()}" // HTTP request done on first read + def resp = new groovy.json.JsonSlurper().parseText(req.getInputStream().getText()) + logger.quiet "Response: ${resp}" + } + return +} +task createGithubRelease { + doLast { + createGithubReleaseFunc() + } +} + task usrdoc(type:Exec) { group = JavaBasePlugin.DOCUMENTATION_GROUP description = 'Builds the user documentation (html)' @@ -193,5 +246,6 @@ task uploadBin(dependsOn: bindist) { include(name: releaseFile.name) } } + createGithubReleaseFunc() } } \ No newline at end of file From 798ba53eec7e2e33af1d65e22a2adc2da7128ea8 Mon Sep 17 00:00:00 2001 From: claeis Date: Mon, 23 Jan 2023 11:01:28 +0100 Subject: [PATCH 5/5] iox-ili-1.21.16 --- build.gradle | 2 +- docs/CHANGELOG.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b84b171..7fb207f 100644 --- a/build.gradle +++ b/build.gradle @@ -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.16' 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 index e2c3884..bf83c9d 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,12 +1,12 @@ -LATEST VERSION ------------------------------ +ilivalidator 1.13.1 (2023-01-23) +-------------------------------- - ILI2.4 support LIST OF / BAG OF primitive type (#348) - ILI2.4 Vereinfachung des Umgangs mit Zeit (#349) - ILI2.4 MULTI-Geometrien (#347) - ILI2.4 validate MultiArea/MultiSurface topology (#347) - A TRANSLATION OF model must not define new types, but only an alternative transfer format (#361) - skip polygon topology validation if basic checks fail -- iox-ili-1.21.16-SNAPSHOT +- iox-ili-1.21.16 ilivalidator 1.13.0 (2022-12-30) -----------------------------