[jbosstools-commits] JBoss Tools SVN: r43829 - in trunk: esb/tests/org.jboss.tools.esb.project.core.test and 4 other directories.

Author: mickael_istria Date: 2012-09-19 09:39:13 -0400 (Wed, 19 Sep 2012) New Revision: 43829 Modified: trunk/build/parent/pom.xml trunk/esb/tests/org.jboss.tools.esb.project.core.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.seamfp.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml Log: JBIDE-12635: Introduce a new property with default value and profile to simulate a "OR" Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-09-19 13:37:35 UTC (rev 43828) +++ trunk/build/parent/pom.xml 2012-09-19 13:39:13 UTC (rev 43829) @@ -32,6 +32,7 @@ <!-- See JBIDE-12420 --> <skipPrivateRequirements>true</skipPrivateRequirements> <requirementsDirectory>${project.build.directory}/requirements</requirementsDirectory> + <skipTestsWithPrivateRequirements>${skipPrivateRequirements}</skipTestsWithPrivateRequirements> <!-- Tests Timeout in seconds --> <surefire.timeout>2400</surefire.timeout> <!-- Default coverage filter, to be overriden when necessary --> @@ -346,8 +347,6 @@ <url>https://jira.jboss.org/jira/secure/</url> </issueManagement> <profiles> - - <!-- Latest JBT work-in-progress component builds (CI builds), not yet pushed to the above nightly update site --> <!-- disabled by default because it causes local compilation problems --> @@ -857,6 +856,23 @@ </repository> </repositories> </profile> + + <!-- Multiple triggers to disable tests that depends on private requirements + These profiles are workaround for Maven to support minimal operations + http://jira.codehaus.org/browse/MNG-5347 --> + <profile> + <id>mavenTestSkip</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>true</value> + </property> + </activation> + <properties> + <maven.test.skip>true</maven.test.skip> + <skipTestsWithPrivateRequirements>true</skipTestsWithPrivateRequirements> + </properties> + </profile> </profiles> <repositories> Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-09-19 13:37:35 UTC (rev 43828) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-09-19 13:39:13 UTC (rev 43829) @@ -9,7 +9,7 @@ </parent> <groupId>org.jboss.tools.esb.tests</groupId> <artifactId>org.jboss.tools.esb.project.core.test</artifactId> - + <packaging>eclipse-test-plugin</packaging> <properties> @@ -69,7 +69,7 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> - <skip>${skipPrivateRequirements}</skip> + <skip>${skipTestsWithPrivateRequirements}</skip> <explodedBundles> <bundle>org.jboss.tools.esb.project.core</bundle> </explodedBundles> Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2012-09-19 13:37:35 UTC (rev 43828) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2012-09-19 13:39:13 UTC (rev 43829) @@ -8,7 +8,7 @@ </parent> <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam121EAP.core.test</artifactId> - + <packaging>eclipse-test-plugin</packaging> <properties> @@ -56,7 +56,7 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> - <skip>${skipPrivateRequirements}</skip> + <skip>${skipTestsWithPrivateRequirements}</skip> <explodedBundles> <bundle>org.jboss.tools.seam.core.test</bundle> <bundle>org.jboss.tools.seam.core</bundle> Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2012-09-19 13:37:35 UTC (rev 43828) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2012-09-19 13:39:13 UTC (rev 43829) @@ -8,7 +8,7 @@ </parent> <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seam121EAP.ui.test</artifactId> - + <packaging>eclipse-test-plugin</packaging> <properties> @@ -56,7 +56,7 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> - <skip>${skipPrivateRequirements}</skip> + <skip>${skipTestsWithPrivateRequirements}</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle> Modified: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2012-09-19 13:37:35 UTC (rev 43828) +++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2012-09-19 13:39:13 UTC (rev 43829) @@ -8,7 +8,7 @@ </parent> <groupId>org.jboss.tools.seam.tests</groupId> <artifactId>org.jboss.tools.seamfp.core.test</artifactId> - + <packaging>eclipse-test-plugin</packaging> <properties> @@ -78,12 +78,12 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> - <skip>${skipPrivateRequirements}</skip> + <skip>${skipTestsWithPrivateRequirements}</skip> <explodedBundles> <bundle>org.jboss.tools.seam.core.test</bundle> <bundle>org.jboss.tools.seam.core</bundle> Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2012-09-19 13:37:35 UTC (rev 43828) +++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2012-09-19 13:39:13 UTC (rev 43829) @@ -1,16 +1,16 @@ <?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"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools.seam</groupId> <artifactId>tests</artifactId> <version>3.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.seam.tests</groupId> - <artifactId>org.jboss.tools.seamfp.ui.test</artifactId> - + <artifactId>org.jboss.tools.seamfp.ui.test</artifactId> + <packaging>eclipse-test-plugin</packaging> - + <properties> <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-eap-4.3/seamfp</systemProperties> <coverage.filter>org.jboss.tools.seam*</coverage.filter> @@ -82,7 +82,7 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> - <skip>${skipPrivateRequirements}</skip> + <skip>${skipTestsWithPrivateRequirements}</skip> <explodedBundles> <bundle>org.jboss.tools.seam.ui.test</bundle> <bundle>org.jboss.tools.seam.core.test</bundle>