Author: pskopek(a)redhat.com Date: 2011-11-13 03:23:40 -0500 (Sun, 13 Nov 2011) New Revision: 1321 Modified: integration-tests/branches/product/ant-scripts/ant-build.xml integration-tests/branches/product/parent/pom.xml integration-tests/branches/product/picketlink-pdp-tests/pom.xml integration-tests/branches/product/picketlink-saml-eap5/pom.xml integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml integration-tests/branches/product/product-preparation/pom.xml Log: Changing antrun-plugin version and properties propagation to ant-build.xml Modified: integration-tests/branches/product/ant-scripts/ant-build.xml =================================================================== --- integration-tests/branches/product/ant-scripts/ant-build.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/ant-scripts/ant-build.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -13,15 +13,18 @@ <property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/> <property environment="env" /> + <!-- <property name="EAP_ZIP" value="jboss-eap-noauth-5.1.2-ER1.zip" /> <property name="CXF_INSTALLER_ZIP" value="jboss-ep-ws-cxf-5.1.2-ER1-installer.zip" /> <property name="EAP_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${EAP_ZIP}" /> <property name="CXF_INSTALLER_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${CXF_INSTALLER_ZIP}" /> - <property name="DIST_DIR" value="${basedir}/../common-dist/target" /> <property name="EAP_DIR" value="jboss-eap-5.1" /> <property name="jboss.profile" value="default" /> <property name="pl-fed-webapps-assembly-version" value="2.0.1.1.final" /> - +--> + <property name="DIST_DIR" value="${basedir}/../common-dist/target" /> + <property name="EAP_DIR" value="jboss-eap-5.1" /> + <target name="download-eap"> <if> <available file="${DIST_DIR}/${EAP_ZIP}"/> Modified: integration-tests/branches/product/parent/pom.xml =================================================================== --- integration-tests/branches/product/parent/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/parent/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -33,14 +33,15 @@ <pl-fed-webapps-assembly-version>2.0.1.1.final</pl-fed-webapps-assembly-version> <maven.compiler.target>1.6</maven.compiler.target> <eap-home>${basedir}/target/jboss-eap-5.1/jboss-as</eap-home> - <!-- EAP_ZIP>jboss-eap-noauth-5.1.1.zip</EAP_ZIP --> - <EAP_ZIP>jboss-eap-noauth-5.1.2-ER1.zip</EAP_ZIP> + <EAP_ZIP>jboss-eap-noauth-5.1.1.zip</EAP_ZIP> + <!-- EAP_ZIP>jboss-eap-noauth-5.1.2-ER1.zip</EAP_ZIP --> <CXF_INSTALLER_ZIP>jboss-ep-ws-cxf-5.1.2-ER1-installer.zip</CXF_INSTALLER_ZIP> <downloadURL.prefix>file:///mnt/jqa/eap/5.1.2.ER1</downloadURL.prefix> <EAP_URL>${downloadURL.prefix}/${EAP_ZIP}</EAP_URL> <CXF_INSTALLER_URL>${downloadURL.prefix}/${CXF_INSTALLER_ZIP}</CXF_INSTALLER_URL> <jboss.profile>default</jboss.profile> <jboss.dist>${basedir}/../product-preparation/target/jboss-eap-5.1</jboss.dist> + <property name="localRepository" value="${user.home}/.m2/repository"/> </properties> @@ -74,7 +75,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> + <version>1.7</version> </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> @@ -92,7 +93,7 @@ <artifactId> maven-antrun-plugin </artifactId> - <versionRange>[1.4,)</versionRange> + <versionRange>[1.7,)</versionRange> <goals> <goal>run</goal> </goals> Modified: integration-tests/branches/product/picketlink-pdp-tests/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -52,14 +52,22 @@ <id>phase-1</id> <phase>compile</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + </target> </configuration> <goals> <goal>run</goal> @@ -69,12 +77,13 @@ <id>phase-2</id> <phase>test</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + </ant> + </target> </configuration> <goals> <goal>run</goal> Modified: integration-tests/branches/product/picketlink-saml-eap5/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-saml-eap5/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/picketlink-saml-eap5/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -63,15 +63,26 @@ <id>phase-1</id> <phase>compile</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <property name="jboss.dist" value="${jboss.dist}" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5"> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="pl-trust-version" value="${pl-trust-version}"/> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}"/> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="pl-trust-version" value="${pl-trust-version}"/> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}"/> + </ant> + </target> </configuration> <goals> <goal>run</goal> @@ -81,12 +92,9 @@ <id>phase-2</id> <phase>test</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" /> + </target> </configuration> <goals> <goal>run</goal> Modified: integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -72,16 +72,32 @@ <id>phase-1</id> <phase>compile</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <property name="jboss.dist" value="${jboss.dist}" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5-cxf" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5-cxf"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + </target> </configuration> <goals> <goal>run</goal> @@ -91,12 +107,13 @@ <id>phase-2</id> <phase>test</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + </ant> + </target> </configuration> <goals> <goal>run</goal> Modified: integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -73,16 +73,32 @@ <id>phase-1</id> <phase>compile</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <property name="jboss.dist" value="${jboss.dist}" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + </target> </configuration> <goals> <goal>run</goal> @@ -92,12 +108,12 @@ <id>phase-2</id> <phase>test</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5"> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + </ant> + </target> </configuration> <goals> <goal>run</goal> Modified: integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/picketlink-trust-eap5-cxf/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -126,17 +126,40 @@ <id>phase-1</id> <phase>compile</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <property name="jboss.dist" value="${jboss.dist}" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5-cxf" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-trust-settings-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5-cxf"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-trust-settings-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> + </ant> + </target> </configuration> <goals> <goal>run</goal> @@ -146,12 +169,13 @@ <id>phase-2</id> <phase>test</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + </ant> + </target> </configuration> <goals> <goal>run</goal> Modified: integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/picketlink-trust-eap5-native/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -118,18 +118,40 @@ <id>phase-1</id> <phase>compile</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <property name="jboss.dist" value="${jboss.dist}" /> - <property name="EAP_ZIP" value="${EAP_ZIP}" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-trust-settings-eap5" /> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-trust-settings-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss.dist}" /> + <property name="EAP_ZIP" value="${EAP_ZIP}" /> + </ant> + </target> </configuration> <goals> <goal>run</goal> @@ -139,12 +161,13 @@ <id>phase-2</id> <phase>test</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + </ant> + </target> </configuration> <goals> <goal>run</goal> Modified: integration-tests/branches/product/product-preparation/pom.xml =================================================================== --- integration-tests/branches/product/product-preparation/pom.xml 2011-11-08 15:09:23 UTC (rev 1320) +++ integration-tests/branches/product/product-preparation/pom.xml 2011-11-13 08:23:40 UTC (rev 1321) @@ -19,13 +19,19 @@ <id>phase-1</id> <phase>compile</phase> <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="unzip-jboss-distributed-test-deps" /> - </tasks> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="unzip-jboss-distributed-test-deps"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="pl-trust-version" value="${pl-trust-version}"/> + <property name="downloadURL.prefix" value="${downloadURL.prefix}"/> + <property name="jboss.profile" value="${jboss.profile}"/> + <property name="CXF_INSTALLER_ZIP" value="${CXF_INSTALLER_ZIP}"/> + <property name="EAP_ZIP" value="${EAP_ZIP}"/> + </ant> + </target> </configuration> <goals> <goal>run</goal>