Permalink
Browse files

Resolve issue #113 by accepting rdeltour's pull request

  • Loading branch information...
ndw committed Aug 20, 2013
1 parent 105aaf6 commit 4c77408fad9772caeb7fbd1a1d386b8d16554e1e
Showing with 14 additions and 10 deletions.
  1. +11 −7 build.xml
  2. +1 −1 osgi/calabash.bnd
  3. +2 −2 pom.xml
View
@@ -56,7 +56,7 @@
<!-- define Maven coordinates -->
<property name="groupId" value="com.xmlcalabash" />
<property name="artifactId" value="xmlcalabash" />
<property name="mvn-version" value="${version}-${saxon-version}"/>
<property name="mvn-version" value="${version}-${saxon-version-short}"/>
<!-- define artifact names, which follow the convention of Maven -->
<property name="maven.dir" value="${dist.dir}/maven" />
@@ -105,20 +105,23 @@
<target name="init" depends="saxon-version">
<mkdir dir="${build.dir}"/>
<property name="dist-version" value="${version}-${saxon-version}"/>
<property name="dist-version" value="${version}-${saxon-version-short}"/>
<property name="install.dir" value="${dist.dir}/calabash-${dist-version}"/>
</target>
<target name="saxon95" if="saxon95">
<property name="saxon-version" value="95"/>
<property name="saxon-version-short" value="95"/>
<property name="saxon-version" value="9.5.1.1"/>
</target>
<target name="saxon94" if="saxon94" unless="saxon95">
<property name="saxon-version" value="94"/>
<target name="saxon94" if="saxon94">
<property name="saxon-version-short" value="94"/>
<property name="saxon-version" value="9.4.0.7"/>
</target>
<target name="saxon93" unless="saxon94">
<property name="saxon-version" value="93"/>
<property name="saxon-version-short" value="93"/>
<property name="saxon-version" value="9.3.0"/>
</target>
<target name="saxon-version" depends="saxon93,saxon94,saxon95">
@@ -525,7 +528,8 @@ java -Xmx1024m -jar %INSTALL_PATH/calabash.jar "$@"
<!-- Update the version in the POM -->
<copy file="pom.xml" toFile="${maven.dir}/pom.xml">
<filterset>
<filter token="version" value="${version}"/>
<filter token="version" value="${mvn-version}"/>
<filter token="saxon-version" value="${saxon-version}"/>
</filterset>
</copy>
</target>
View
@@ -10,7 +10,7 @@ Bundle-Version: ${dist-version}
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: *, etc
Import-Package: \
net.sf.saxon.*;version=${if;${def;saxon94};9.4.0;9.3.0},\
net.sf.saxon.*;version=${if;${def;saxon95};9.5.0;${if;${def;saxon94};9.4.0;9.3.0}},\
javax.crypto.*,\
javax.xml.*,\
org.apache.commons.httpclient.*,\
View
@@ -56,7 +56,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.4.0.7</version>
<version>@saxon-version@</version>
</dependency>
<!-- No need to specify commons-logging or commons-codec - they're transitive dependencies of httpclient -->
@@ -125,4 +125,4 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>
</project>

0 comments on commit 4c77408

Please sign in to comment.