Author: objectiser Date: 2009-11-17 09:37:12 -0500 (Tue, 17 Nov 2009) New Revision: 275 Modified: trunk/integration-tests/build.xml trunk/integration-tests/pom.xml trunk/runtime/engine-assembly/build.xml trunk/runtime/engine-assembly/pom.xml Log: Pass riftsaw.engine.version property into ant scripts, rather than defining again. Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2009-11-17 14:26:39 UTC (rev 274) +++ trunk/integration-tests/build.xml 2009-11-17 14:37:12 UTC (rev 275) @@ -1,7 +1,6 @@ <project name="integration-tests" basedir="."> <property environment="env" /> - <property name="riftsaw.engine.version" value="2.0-SNAPSHOT" /> <property name="replace.qa.jdbc" value="true" /> <property file="${riftsaw.test.deployment.properties}" /> Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2009-11-17 14:26:39 UTC (rev 274) +++ trunk/integration-tests/pom.xml 2009-11-17 14:37:12 UTC (rev 275) @@ -169,6 +169,8 @@ <property name="test_classpath" refid="maven.test.classpath" /> <property name="plugin_classpath" refid="maven.plugin.classpath" /> <property name="project.version" value="${project.version}" /> + <property name="riftsaw.engine.version" + value="${riftsaw.engine.version}" /> <property name="dependency.bpel.deployer" value="${maven.dependency.org.jboss.soa.bpel.runtime.deployer.jar.path}" /> <property name="dependency.bpel.engine" @@ -204,6 +206,8 @@ <property name="test_classpath" refid="maven.test.classpath" /> <property name="plugin_classpath" refid="maven.plugin.classpath" /> <property name="project.version" value="${project.version}" /> + <property name="riftsaw.engine.version" + value="${riftsaw.engine.version}" /> <property name="dependency.bpel.deployer" value="${maven.dependency.org.jboss.soa.bpel.runtime.deployer.jar.path}" /> <property name="dependency.bpel.engine" Modified: trunk/runtime/engine-assembly/build.xml =================================================================== --- trunk/runtime/engine-assembly/build.xml 2009-11-17 14:26:39 UTC (rev 274) +++ trunk/runtime/engine-assembly/build.xml 2009-11-17 14:37:12 UTC (rev 275) @@ -1,7 +1,5 @@ <project name="engine-assembly" default="package-bpel" basedir="."> - <property name="riftsaw.engine.version" value="2.0-SNAPSHOT" /> - <target name="unzip-ode"> <mkdir dir="${basedir}/target/ode-distro"/> <echo>${local.repo}</echo> @@ -18,7 +16,7 @@ <include name="riftsaw-dao-jpa*.jar" /> <include name="axis2-spring-*.jar" /> <include name="axis2-saaj-api-*.jar" /> - <!-- Required for ODE1.3.3 + <!-- Required for ODE2.0 <include name="saxon-xqj-*.jar" /> --> <include name="woden-impl-dom-*.jar" /> Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2009-11-17 14:26:39 UTC (rev 274) +++ trunk/runtime/engine-assembly/pom.xml 2009-11-17 14:37:12 UTC (rev 275) @@ -56,6 +56,8 @@ <property name="plugin_classpath" refid="maven.plugin.classpath" /> <property name="project.version" value="${project.version}" /> <property name="local.repo" value="${settings.localRepository}" /> + <property name="riftsaw.engine.version" + value="${riftsaw.engine.version}" /> <property name="dependency.bpel.deployer" value="${maven.dependency.org.jboss.soa.bpel.runtime.deployer.jar.path}" /> <property name="dependency.bpel.engine"