From d9bdd585ae66f04d62cd4affdb0461e5fe9ccd1d Mon Sep 17 00:00:00 2001 From: claeis Date: Fri, 29 Dec 2023 17:20:33 +0100 Subject: [PATCH 01/10] start 1.14.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a5ae6ad..fc5cc15 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ allprojects { compileJava.options.encoding = 'US-ASCII' } -version '1.14.1'+System.getProperty('release','-SNAPSHOT') +version '1.14.2'+System.getProperty('release','-SNAPSHOT') configurations { deployerJars From 4ef1c73d1b0e22e04ae0006eab81afaf21150c0e Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 1 May 2024 14:25:29 +0200 Subject: [PATCH 02/10] - iox-ili-1.23.0 - ili2c-5.5.3 --- build.gradle | 6 +++--- docs/CHANGELOG.txt | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index fc5cc15..00eb9d5 100644 --- a/build.gradle +++ b/build.gradle @@ -24,9 +24,9 @@ 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.22.1' - compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.4.1" - compile group: 'ch.interlis', name: 'ili2c-core', version: "5.4.1" + compile group: 'ch.interlis', name: 'iox-ili', version: '1.23.0' + compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.5.3" + compile group: 'ch.interlis', name: 'ili2c-core', version: "5.5.3" testCompile group: 'junit', name: 'junit', version: '4.12' deployerJars "org.apache.maven.wagon:wagon-ftp:3.3.3" deployerJars "org.apache.maven.wagon:wagon-ssh:3.3.3" diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 8d234a7..af5447b 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,3 +1,8 @@ +ilivalidator 1.14.2 (2024-05-01) +-------------------------------- +- iox-ili-1.23.0 +- ili2c-5.5.3 + ilivalidator 1.14.1 (2023-12-29) -------------------------------- - implement Math_V2, Text_V2 (#375) From 45ed031eb0587eb5f063b94d39cefec3cc9abbb9 Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 1 May 2024 14:33:49 +0200 Subject: [PATCH 03/10] fix rst syntax --- docs/ilivalidator.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ilivalidator.rst b/docs/ilivalidator.rst index d001374..3dd4dab 100644 --- a/docs/ilivalidator.rst +++ b/docs/ilivalidator.rst @@ -274,7 +274,7 @@ Optionen: | | | +---------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | ``--runtimeParams param=value`` | Definiert Werte für Laufzeitparameter (RunTimeParameterDef). Mehrere Laufzeitparameter werden durch Semikolon ‚;‘ getrennt. Als Parametername muss der qualifizierte Namen verwendet werden. | -| | Beispiel: ``--runtimeParams ModelA.Param1=testValue1;ModelB.Param2=testValue2`` | +| | Beispiel: ``--runtimeParams ModelA.Param1=testValue1;ModelB.Param2=testValue2`` | +---------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | ``--singlePass`` | Schaltet alle Prüfungen aus, die nicht unmittelbar beim Ersten Lesen der Objekte ausgeführt werden können. | | | | From 533f078ca1fddfaaf58c321141de5b716be0cce6 Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 1 May 2024 14:45:01 +0200 Subject: [PATCH 04/10] build html --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0aacf72..a79774b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ branches: install: true script: - - ./gradlew build + - ./gradlew -Drst2html=`which rst2html.py` build usrdoc deploy: - provider: script skip_cleanup: true @@ -17,6 +17,6 @@ deploy: branch: master - provider: script skip_cleanup: true - 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 + script: ./gradlew -Drst2html=`which rst2html.py` -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 From 1493d1054de3a3693fead4865ebe88ec7c9b5999 Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 1 May 2024 14:50:53 +0200 Subject: [PATCH 05/10] build html --- .travis.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a79774b..d152ab2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,27 @@ language: java - + +addons: + ssh_known_hosts: + - ftp.interlis.ch + apt: + packages: + - python3 + - python3-pip + branches: only: - master - stable install: true - + +before_script: + - python3 --version + - virtualenv -p python3 my_py3 + - source my_py3/bin/activate # to activate the python3 environemt + - python -m pip install docutils # use my_py3 + - python -m pip freeze + script: - ./gradlew -Drst2html=`which rst2html.py` build usrdoc deploy: From 9323bb434b21dee08de5b453e2b0f1542dceedcd Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 19 Jun 2024 14:59:59 +0200 Subject: [PATCH 06/10] upload doc --- .travis.yml | 2 +- build.gradle | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d152ab2..1372998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ script: deploy: - provider: script skip_cleanup: true - script: ./gradlew -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE uploadArchives + script: ./gradlew -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE -Ddocs_pwd=${docs_pwd} -Ddocs_usr=jql_docs uploadArchives uploadDoc on: branch: master - provider: script diff --git a/build.gradle b/build.gradle index 00eb9d5..fe7c9ff 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,9 @@ dependencies { deployerJars "org.apache.maven.wagon:wagon-ftp:3.3.3" deployerJars "org.apache.maven.wagon:wagon-ssh:3.3.3" - ftpAntTask "org.apache.ant:ant-commons-net:1.10.7" + //ftpAntTask "org.apache.ant:ant-commons-net:1.10.7" + //ftpAntTask "org.apache.ant:ant-commons-net:1.10.14" + ftpAntTask "org.apache.ant:ant-commons-net:1.9.16" // muss zu gradle builtin ant version passen! testRuntime project('demoplugin') } @@ -54,6 +56,8 @@ def repos_pwd = System.getProperty('repos_pwd',properties.get('repos_pwd','repos def repos_usr = System.getProperty('repos_usr',properties.get('repos_usr','repos_usr')) def downloads_pwd = System.getProperty('downloads_pwd',properties.get('downloads_pwd','downloads_pwd')) def downloads_usr = System.getProperty('downloads_usr',properties.get('downloads_usr','downloads_usr')) +def docs_pwd = System.getProperty('docs_pwd',properties.get('docs_pwd','docs_pwd')) +def docs_usr = System.getProperty('docs_usr',properties.get('docs_usr','docs_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')) @@ -248,4 +252,23 @@ task uploadBin(dependsOn: bindist) { } createGithubReleaseFunc() } -} \ No newline at end of file +} + +task uploadDoc(){ // dependsOn: [usrdoc,ilidoc]) { + doLast { + ant.taskdef(name: 'ftp', + classname: 'org.apache.tools.ant.taskdefs.optional.net.FTP', + classpath: configurations.ftpAntTask.asPath) + def remoteDir="/ilivalidator/"+project.version + ant.ftp(action:"mkdir", server: "jql.ftp.infomaniak.com", userid: docs_usr, password: docs_pwd, + remoteDir: remoteDir, passive:"yes") { + } + ant.ftp(server: "jql.ftp.infomaniak.com", userid: docs_usr, password: docs_pwd, + remoteDir: remoteDir, passive:"yes") { + fileset(dir: "build/docs") { + include(name: "ilivalidator.html") + } + } + } +} + From 70ac036d59f8afed49d737b204e9a7b2b2e0e0da Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 19 Jun 2024 15:15:57 +0200 Subject: [PATCH 07/10] fix There was a problem confirming the ssl --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1372998..ea6a0c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_script: - python3 --version - virtualenv -p python3 my_py3 - source my_py3/bin/activate # to activate the python3 environemt - - python -m pip install docutils # use my_py3 + - python -m pip --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org install docutils # use my_py3 - python -m pip freeze script: From 3fefb3f5699f029f19935011ad0b6190b43beab3 Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 19 Jun 2024 15:30:33 +0200 Subject: [PATCH 08/10] fix WARNING about missing Pygments --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea6a0c3..3a0d520 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,8 @@ before_script: - python3 --version - virtualenv -p python3 my_py3 - source my_py3/bin/activate # to activate the python3 environemt - - python -m pip --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org install docutils # use my_py3 + - python -m pip --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org install docutils + - python -m pip --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org install Pygments - python -m pip freeze script: From 8ef5426b07ec19e790fcf02a7398824933883fee Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 19 Jun 2024 15:38:52 +0200 Subject: [PATCH 09/10] upload doc only on releases --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a0d520..c47dc60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,11 @@ script: deploy: - provider: script skip_cleanup: true - script: ./gradlew -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE -Ddocs_pwd=${docs_pwd} -Ddocs_usr=jql_docs uploadArchives uploadDoc + script: ./gradlew -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE uploadArchives on: branch: master - provider: script skip_cleanup: true - script: ./gradlew -Drst2html=`which rst2html.py` -Dgithub_token=${github_token} -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE '-Drelease=' -Ddownloads_pwd=${downloads_pwd} -Ddownloads_usr=jql_downloads uploadArchives uploadBin + script: ./gradlew -Drst2html=`which rst2html.py` -Dgithub_token=${github_token} -Drepos_pwd=${repos_pwd} -Drepos_usr=jql_jars-INTE '-Drelease=' -Ddownloads_pwd=${downloads_pwd} -Ddownloads_usr=jql_downloads -Ddocs_pwd=${docs_pwd} -Ddocs_usr=jql_docs uploadArchives uploadBin uploadDoc on: branch: stable From 30c3cc3b72aa7b6c672d2ef097769efc8233b679 Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 19 Jun 2024 15:42:31 +0200 Subject: [PATCH 10/10] fix release date (#411) --- docs/CHANGELOG.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index af5447b..2a018eb 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,4 +1,4 @@ -ilivalidator 1.14.2 (2024-05-01) +ilivalidator 1.14.2 (2024-06-19) -------------------------------- - iox-ili-1.23.0 - ili2c-5.5.3