Author: dgolovin Date: 2010-06-24 19:13:52 -0400 (Thu, 24 Jun 2010) New Revision: 23016 Modified: trunk/requirements/build.xml trunk/requirements/buildRequirements.xml trunk/requirements/generic/build.xml trunk/seam/features/org.jboss.tools.seam.feature/pom.xml trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml Log: https://jira.jboss.org/browse/JBIDE-6492 Skip requirements download if -o (offline) option is specified requirements build checks: - maven.test.skip - settings.offline if first is defined in -D in command line, requirements build is skipped if second is defined as -o in command line, downloaded before requirements are used, if something is missing it just skipped with message Modified: trunk/requirements/build.xml =================================================================== --- trunk/requirements/build.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/requirements/build.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -1,27 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- ====================================================================== - May 21, 2010 4:44:14 PM - - project - description - - eskimo - ====================================================================== --> <project name="project" default="default"> - <description> - description - </description> - - <!-- ================================= - target: default - ================================= --> <import file="buildRequirements.xml" /> + <property name="requirement.root" value="${basedir}" /> - <property name="requirement.build.root" value="${basedir}/download" /> - <target name="default" description="description"> - <echo>requirements=${requirements}</echo> - <echo>unzipto=${basedir}/target/requirements</echo> - <buildRequirements requirements="${requirements}" unzipto="${basedir}/target" /> - </target> + <property name="requirement.download.root" value="${basedir}/download" /> + + <condition property="skipRequirementBuild"> + <equals arg1="${maven.test.skip}" arg2="true"/> + </condition> + + <target name="default" description="description" unless="skipRequirementBuild"> + <echo>maven.test.skip=${maven.test.skip}</echo> + <echo>settings.offline=${settings.offline}</echo> + <echo>requirements=${requirements}</echo> + <echo>unzipto=${basedir}/target/requirements</echo> + <buildRequirements requirements="${requirements}" unzipto="${basedir}/target" /> + </target> </project> Modified: trunk/requirements/buildRequirements.xml =================================================================== --- trunk/requirements/buildRequirements.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/requirements/buildRequirements.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -141,42 +141,4 @@ </sequential> </target--> - <target name="getBaseRequirements"> - <property file="build.requires" /> - <buildRequirements requirements="${build.requires}" unzipto="${build.output.directory}" /> - </target> - - <target name="cleanRequirements"> - <!-- https://jira.jboss.org/jira/browse/JBQA-3313 Use static, shared space outside workspace, instead of working directly in the workspace --> - <if> - <available file="/home/hudson/static_build_env/jbds" type="dir" /> - <then> - <var name="requirement.build.root" unset="true" /> - <property name="requirement.build.root" value="/home/hudson/static_build_env/jbds/requirements" /> - <mkdir dir="${requirement.build.root}" /> - </then> - </if> - <echo level="debug">requirement.build.root = ${requirement.build.root}</echo> - - <delete failonerror="false" includeemptydirs="true"> - <fileset dir="${requirement.root}" defaultexcludes="false"> - <include name="**/return.properties" /> - </fileset> - <!-- should check build.destination if builder is build instead of creating temp files in local SVN copy--> - <fileset dir="${build.root}/builders"> - <include name="**/builder.built" /> - </fileset> - </delete> - </target> - - <macrodef name="buildBuilders"> - <attribute name="builders" /> - <sequential> - <for list="@{builders}" param="current-builder"> - <sequential> - <runBuilder builder="@{current-builder}" /> - </sequential> - </for> - </sequential> - </macrodef> </project> \ No newline at end of file Modified: trunk/requirements/generic/build.xml =================================================================== --- trunk/requirements/generic/build.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/requirements/generic/build.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -4,7 +4,7 @@ <property name="driver.properties" value="${basedir}/build.properties" /> <loadproperties srcFile="${driver.properties}"/> - <property name="driver.dest" value="${requirement.build.root}/${requirement}"/> + <property name="driver.dest" value="${requirement.download.root}/${requirement}"/> <target name="init" /> @@ -19,22 +19,25 @@ <target name="unzip.archive" depends="download.archive"> <property name="ext" value="zip"/> <echo level="debug">Unpacking ${driver.dest}/${build.archive} to ${unzip.dest}</echo> - <antcall target="unpack-${ext}" /> - <!--unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}" /--> - <tstamp/> - <antcall target="post.unpack.requirement" /> + <if> + <available file="${driver.dest}/${build.archive}" /> + <then> + <antcall target="unpack-${ext}" /> + <tstamp/> + <antcall target="post.unpack.requirement"/> + </then> + </if> + </target> <target name="post.unpack.requirement"> - <!--echo file="${requirement.root}/${requirement}/return.properties"># Generated on ${DSTAMP} ${TSTAMP} - </echo--> </target> - <target name="unpack-tar.gz" > + <target name="unpack-tar.gz"> <untar compression="gzip" src="${driver.dest}/${build.archive}" dest="${unzip.dest}" /> </target> - <target name="unpack-zip" > + <target name="unpack-zip"> <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}" /> </target> @@ -51,7 +54,7 @@ <checksum file="${driver.dest}/${build.archive}" property="current.md5"/> <echo level="verbose">${current.md5} calculated</echo> <echo level="verbose">${md5} provided</echo> - <condition property="archive.exists"> + <condition property="archive.exists" > <equals arg1="${current.md5}" arg2="${md5}"/> </condition> <if> @@ -77,14 +80,25 @@ </target> <target name="download.archive" depends="check.archive" unless="archive.exists"> - <mkdir dir="${driver.dest}"/> - <get taskname="download ${requirement}" - src="${build.uri}/${build.archive}" - dest="${driver.dest}/${build.archive}" /> - <antcall target="post.download.requirement"/> + <if> + <or> + <equals arg1="${settings.offline}" arg2="true" /> + <equals arg1="${maven.test.skip}" arg2="true" /> + </or> + <then> + <echo>Skip download for ${build.uri}/${build.archive} because of tests are skept or build is running in offline mode</echo> + </then> + <else> + <mkdir dir="${driver.dest}"/> + <get taskname="download ${requirement}" + src="${build.uri}/${build.archive}" + dest="${driver.dest}/${build.archive}" /> + <antcall target="post.download.requirement"/> + </else> + </if> </target> <target name="post.download.requirement"> </target> - + </project> Modified: trunk/seam/features/org.jboss.tools.seam.feature/pom.xml =================================================================== --- trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,8 +7,8 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.seam.feature</artifactId> + <groupId>org.jboss.tool.seam.features</groupId> + <artifactId>org.jboss.tools.seam.feature</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml =================================================================== --- trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -42,4 +42,95 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.jboss.tools.seam121EAP.core.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam121EAP.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam201GA.core.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam201GA.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam202SP1.core.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam202SP1.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam203CR1.core201.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam203CR1.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam211GA.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam220CR1.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seam220GA.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seamfp.core.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.seamfp.ui.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml =================================================================== --- trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.features</groupId> <artifactId>org.jboss.tools.seam.test.feature</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -375,7 +375,10 @@ <attribute name="kind"/> <persistent value="true"> - </persistent> + </persistent> + <attribute + name="seamRuntimeName"> + </attribute> </extension> <extension @@ -535,4 +538,4 @@ </exclude> </validator> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.core</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.doc.user</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.pages.xml</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.text.ext</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.ui</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.ui.pages</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.xml</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.xml.ui</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -8,7 +8,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -26,13 +26,11 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.core.test</bundle> <bundle>org.jboss.tools.seam.core</bundle> </explodedBundles> <product>org.jboss.tools.tests</product> - <!--argLine>-Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</argLine--> <includes> <include>org/jboss/tools/seam/core/test/SeamValidatorsAllTests.class</include> <include>org/jboss/tools/seam/core/test/SeamCoreAllTests.class</include> @@ -41,24 +39,7 @@ </configuration> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> + <artifactId>maven-antrun-plugin</artifactId> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam.pages.xml.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam.ui.bot.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> @@ -25,7 +25,6 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.core.test</bundle> <bundle>org.jboss.tools.seam.core</bundle> @@ -37,24 +36,7 @@ </configuration> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> + <artifactId>maven-antrun-plugin</artifactId> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam.xml.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -8,7 +8,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam121EAP.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -38,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam121EAP.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -25,7 +25,6 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle> @@ -39,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -8,7 +8,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam201GA.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -38,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam201GA.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -25,7 +25,6 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle> @@ -39,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -8,7 +8,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam202SP1.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -37,23 +37,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam202SP1.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -25,7 +25,6 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle> @@ -39,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -8,7 +8,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam203CR1.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -38,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam203CR1.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -25,7 +25,6 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle> @@ -39,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.tests</groupId> <artifactId>org.jboss.tools.seam211GA.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -39,23 +39,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam220CR1.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -25,7 +25,6 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle> @@ -39,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.tests</groupId> <artifactId>org.jboss.tools.seam220GA.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -39,23 +39,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -8,7 +8,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.tests</groupId> <artifactId>org.jboss.tools.seamfp.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -38,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-24 22:51:53 UTC (rev 23015) +++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-24 23:13:52 UTC (rev 23016) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seamfp.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -25,7 +25,6 @@ <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> <configuration> - <skip>false</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle> @@ -39,23 +38,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>prepare-eclipse-base</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant dir="${projectRoot}/requirements" inheritAll="true"> - <property name="requirements" value="${requirements}" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> </plugin> </plugins> </build>