Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@claeis
claeis committed Jun 19, 2024
2 parents 24c5f1a + 30c3cc3 commit 145e782
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 11 deletions.
24 changes: 20 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
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 --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:
- ./gradlew build
- ./gradlew -Drst2html=`which rst2html.py` build usrdoc
deploy:
- provider: script
skip_cleanup: true
Expand All @@ -17,6 +33,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 -Ddocs_pwd=${docs_pwd} -Ddocs_usr=jql_docs uploadArchives uploadBin uploadDoc
on:
branch: stable
35 changes: 29 additions & 6 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,14 +24,16 @@ 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"

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')
}
Expand All @@ -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'))
Expand Down Expand Up @@ -248,4 +252,23 @@ task uploadBin(dependsOn: bindist) {
}
createGithubReleaseFunc()
}
}
}

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")
}
}
}
}

5 changes: 5 additions & 0 deletions docs/CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
ilivalidator 1.14.2 (2024-06-19)
--------------------------------
- iox-ili-1.23.0
- ili2c-5.5.3

ilivalidator 1.14.1 (2023-12-29)
--------------------------------
- implement Math_V2, Text_V2 (#375)
Expand Down
2 changes: 1 addition & 1 deletion docs/ilivalidator.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. |
| | |
Expand Down

0 comments on commit 145e782

Please sign in to comment.