Skip to content

Commit

Permalink
Merge branch 'fix-antVersion'
Browse files Browse the repository at this point in the history
  • Loading branch information
bwbohl committed Feb 12, 2015
2 parents 6f7a2e3 + 0557ec2 commit aef442e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "FreiDi:topicMapViz",
"version": "0.7.0-beta",
"version": "0.7.1-beta",
"authors": [
"Benjamin W. Bohl <bohl@edirom.de>"
],
Expand All @@ -24,7 +24,6 @@
"jquery": "~2.1.1",
"bootstrap": "~3.2.0",
"d3": "~3.4.13",
"bootstrap-list-filter": "https://github.com/stefanocudini/bootstrap-list-filter/releases/tag/v0.1.7",
"tm-converter": "svn+http://topic-maps.googlecode.com/svn/tm-converter/"
"bootstrap-list-filter": "https://github.com/stefanocudini/bootstrap-list-filter/releases/tag/v0.1.7"
}
}
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="xar" name="proofMEIdata">

<property name="project.version" value="0.5.0-alpha"/>
<property name="project.version" value="0.7.1-beta"/>
<property name="project.app" value="FreiDi-topicMapViz"/>
<property name="build.dir" value="build"/>

<target name="xar">
<mkdir dir="${build.dir}"/>
<zip basedir="." destfile="${build.dir}/${project.app}-${project.version}.xar"
excludes="**/bower_components/*"
includes="templates/*, about.html, controller.xql, modules/*, error-page.html, repo.xml, expath-pkg.xml, index.html, data/**, src/**,bower_components/bootstrap/dist/css/bootstrap.min.css,bower_components/bootstrap/dist/css/bootstrap-theme.min.css,dist/bower.js, bower_components/bootstrap/dist/js/bootstrap.min.js, topicMaps/FreiDi_TopicMap_2.xml"/>
includes="templates/*, about.html, controller.xql, modules/*, error-page.html, repo.xml, expath-pkg.xml, index.html, data/**, src/**,bower_components/bootstrap/dist/css/bootstrap.min.css,bower_components/bootstrap/dist/css/bootstrap-theme.min.css,dist/**, bower_components/bootstrap/dist/js/bootstrap.min.js, topicMaps/FreiDi_TopicMap_2.xml"/>
</target>
</project>
2 changes: 1 addition & 1 deletion data/xql/getJSONtopicMap.xql
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ declare option exist:serialize "method=text media-type=text/plain omit-xml-decla
let $doc := xmldb:document($config:app-root||'/topicMaps/FreiDi_TopicMap_2.xml')
let $xslt := xmldb:document($config:app-root||'/data/tm-converter/xtm2tojtm1.xsl')

let $jtm := transform:transform($doc, $xslt, ())
let $jtm := transform:transform($doc, $xslt, <parameters><param name="jtm_version" value="1.1"/></parameters>)

return
$jtm
2 changes: 1 addition & 1 deletion expath-pkg.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://expath.org/ns/pkg" name="http://freischuetz-digital.de/topicMapViz" abbrev="topicMapViz" version="0.7.0-beta" spec="1.0">
<package xmlns="http://expath.org/ns/pkg" name="http://freischuetz-digital.de/topicMapViz" abbrev="topicMapViz" version="0.7.1-beta" spec="1.0">
<title>FreiDi:topicMapViz</title>
</package>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "FreiDi-topicMapViz",
"version": "0.7.0-beta",
"version": "0.7.1-beta",
"repository": {
"type": "git",
"url": "git://github.com/Freischuetz-Digital/topicMapViz.git"
Expand Down

0 comments on commit aef442e

Please sign in to comment.