Author: dgolovin
Date: 2010-06-25 13:39:16 -0400 (Fri, 25 Jun 2010)
New Revision: 23050
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-6492 Skip requirements download if -o (offline) option
is specified
fix for as component tests pom.xml errors
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2010-06-25 16:20:33 UTC (rev
23049)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2010-06-25 17:39:16 UTC (rev
23050)
@@ -16,8 +16,9 @@
<requirements>jbossas</requirements>
<projectRoot>${basedir}/../../..</projectRoot>
<requirements.build>${projectRoot}/requirements/target</requirements.build>
+ <systemProperties>-Djbosstools.test.jboss.home.3.2=${requirements.build}/jboss-3.2.8.SP1
-Djbosstools.test.jboss.home.4.0=${requirements.build}/jboss-4.0.5.GA
-Djbosstools.test.jboss.home.4.2=${requirements.build}/jboss-4.2.3.GA
-Djbosstools.test.jboss.home.5.0=${requirements.build}/jboss-5.0.1.GA
-Djbosstools.test.jboss.home.5.1=${requirements.build}/jboss-5.1.0.GA</systemProperties>
</properties>
-
+
<build>
<plugins>
<plugin>
@@ -27,28 +28,10 @@
<explodedBundles>
<bundle>org.jboss.ide.eclipse.as.test</bundle>
</explodedBundles>
- <argLine>-Djbosstools.test.jboss.home.3.2=${requirements.build}/jboss-3.2.8.SP1
-Djbosstools.test.jboss.home.4.0=${requirements.build}/jboss-4.0.5.GA
-Djbosstools.test.jboss.home.4.2=${requirements.build}/jboss-4.2.3.GA
-Djbosstools.test.jboss.home.5.0=${requirements.build}/jboss-5.0.1.GA
-Djbosstools.test.jboss.home.5.1=${requirements.build}/jboss-5.1.0.GA</argLine>
</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>
</plugin>
</plugins>
</build>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml 2010-06-25 16:20:33 UTC (rev
23049)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml 2010-06-25 17:39:16 UTC (rev
23050)
@@ -16,6 +16,7 @@
<requirements>jbossas</requirements>
<projectRoot>${basedir}/../../..</projectRoot>
<requirements.build>${projectRoot}/requirements/target</requirements.build>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=$${projectRoot}/requirements/target/jboss-4.2.3.GA</systemProperties>
</properties>
<build>
@@ -27,30 +28,11 @@
<explodedBundles>
<bundle>org.jboss.ide.eclipse.as.ui.test</bundle>
</explodedBundles>
- <argLine>-Djbosstools.test.jboss.home.4.2=$${projectRoot}/requirements/target/jboss-4.2.3.GA</argLine>
</configuration>
</plugin>
- <!--
- <plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <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>
</project>