Author: nickboldt Date: 2011-09-22 19:13:54 -0400 (Thu, 22 Sep 2011) New Revision: 34980 Modified: trunk/build/aggregate/bottests-site/site/pom.xml trunk/build/aggregate/site/pom.xml trunk/build/aggregate/soa-site/pom.xml Log: nest values of BUILD_ALIAS and JBT_VERSION inside <ant> call Modified: trunk/build/aggregate/bottests-site/site/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979) +++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 23:13:54 UTC (rev 34980) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> @@ -12,11 +13,9 @@ <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> - <!-- to build against locally built sources, use: - mvn clean install - to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use: - mvn clean install -Pjbosstools-nightly-staging-composite - --> + <!-- to build against locally built sources, use: mvn clean install to build + against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, + use: mvn clean install -Pjbosstools-nightly-staging-composite --> <build> <plugins> <plugin> @@ -31,9 +30,10 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <property name="JBT_VERSION" value="${JBT_VERSION}"/> - <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/> - <ant antfile="build.xml"/> + <ant antfile="build.xml"> + <property name="JBT_VERSION" value="${JBT_VERSION}" /> + <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> + </ant> </tasks> </configuration> <goals> Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979) +++ trunk/build/aggregate/site/pom.xml 2011-09-22 23:13:54 UTC (rev 34980) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> @@ -13,8 +14,9 @@ <packaging>eclipse-update-site</packaging> <properties> - <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs - which need to be called by Ant script later --> + <!-- add more inputRepos into the composite metadata at the URL below. + Therefore need not edit this file and add dozens of URLs which need to be + called by Ant script later --> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... <inputRepos>1</inputRepos> @@ -34,11 +36,12 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <property name="inputRepo1" value="${inputRepo1}"/> - <property name="inputRepos" value="${inputRepos}"/> - <property name="JBT_VERSION" value="${JBT_VERSION}"/> - <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/> - <ant antfile="build.xml"/> + <property name="inputRepo1" value="${inputRepo1}" /> + <property name="inputRepos" value="${inputRepos}" /> + <ant antfile="build.xml"> + <property name="JBT_VERSION" value="${JBT_VERSION}" /> + <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> + </ant> </tasks> </configuration> <goals> Modified: trunk/build/aggregate/soa-site/pom.xml =================================================================== --- trunk/build/aggregate/soa-site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979) +++ trunk/build/aggregate/soa-site/pom.xml 2011-09-22 23:13:54 UTC (rev 34980) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> @@ -12,14 +13,13 @@ <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> - <!-- to build against locally built sources, use: - mvn clean install - to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use: - mvn clean install -Pjbosstools-nightly-staging-composite - --> + <!-- to build against locally built sources, use: mvn clean install to build + against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, + use: mvn clean install -Pjbosstools-nightly-staging-composite --> <properties> - <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs - which need to be called by Ant script later --> + <!-- add more inputRepos into the composite metadata at the URL below. + Therefore need not edit this file and add dozens of URLs which need to be + called by Ant script later --> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... <inputRepos>1</inputRepos> @@ -39,11 +39,12 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <property name="inputRepo1" value="${inputRepo1}"/> - <property name="inputRepos" value="${inputRepos}"/> - <property name="JBT_VERSION" value="${JBT_VERSION}"/> - <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/> - <ant antfile="build.xml"/> + <property name="inputRepo1" value="${inputRepo1}" /> + <property name="inputRepos" value="${inputRepos}" /> + <ant antfile="build.xml"> + <property name="JBT_VERSION" value="${JBT_VERSION}" /> + <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> + </ant> </tasks> </configuration> <goals>