Author: lfryc(a)redhat.com Date: 2010-12-21 08:31:08 -0500 (Tue, 21 Dec 2010) New Revision: 20718 Modified: modules/tests/metamer/trunk/application/pom.xml modules/tests/metamer/trunk/build.sh modules/tests/metamer/trunk/ftest/pom.xml modules/tests/metamer/trunk/pom.xml Log: added profiles for jee6 with jsf bundles Modified: modules/tests/metamer/trunk/application/pom.xml =================================================================== --- modules/tests/metamer/trunk/application/pom.xml 2010-12-21 13:30:29 UTC (rev 20717) +++ modules/tests/metamer/trunk/application/pom.xml 2010-12-21 13:31:08 UTC (rev 20718) @@ -320,6 +320,54 @@ </build> </profile> <profile> + <id>war-jee6-bundled-mojarra</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6-bundled-mojarra</id> + <phase>integration-test</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <classifier>jee6-bundled-mojarra</classifier> + <packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*</packagingExcludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>war-jee6-bundled-myfaces</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6-bundled-myfaces</id> + <phase>integration-test</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <classifier>jee6-bundled-myfaces</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*</packagingExcludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>war-mojarra</id> <activation> <property> @@ -509,10 +557,10 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <scope>provided</scope> - </dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </profile> </profiles> Modified: modules/tests/metamer/trunk/build.sh =================================================================== --- modules/tests/metamer/trunk/build.sh 2010-12-21 13:30:29 UTC (rev 20717) +++ modules/tests/metamer/trunk/build.sh 2010-12-21 13:31:08 UTC (rev 20718) @@ -1,2 +1,2 @@ #!/bin/bash -mvn clean install -Pmyfaces,war-myfaces -Dselenium.server.skip=true -Dselenium.test.skip=true $* +mvn clean install -Pmyfaces,war-myfaces,war-jee6-bundled-mojarra,war-jee6-bundled-myfaces -Dselenium.server.skip=true -Dselenium.test.skip=true $* Modified: modules/tests/metamer/trunk/ftest/pom.xml =================================================================== --- modules/tests/metamer/trunk/ftest/pom.xml 2010-12-21 13:30:29 UTC (rev 20717) +++ modules/tests/metamer/trunk/ftest/pom.xml 2010-12-21 13:31:08 UTC (rev 20718) @@ -368,8 +368,7 @@ <profile> <id>jboss6x-mojarra</id> <properties> - <deployable.classifier>jee6</deployable.classifier> - <jsf.config>Mojarra-2.0</jsf.config> + <deployable.classifier>jee6-bundled-mojarra</deployable.classifier> </properties> </profile> <profile> @@ -381,7 +380,7 @@ <profile> <id>jboss6x-myfaces</id> <properties> - <deployable.classifier>myfaces</deployable.classifier> + <deployable.classifier>jee6-bundled-myfaces</deployable.classifier> </properties> </profile> <profile> Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2010-12-21 13:30:29 UTC (rev 20717) +++ modules/tests/metamer/trunk/pom.xml 2010-12-21 13:31:08 UTC (rev 20718) @@ -167,7 +167,7 @@ <plugin> <artifactId>maven-release-plugin</artifactId> <configuration> - <arguments>-Pmyfaces,war-myfaces -Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> + <arguments>-Pmyfaces,war-myfaces,war-jee6-bundled-mojarra,war-jee6-bundled-myfaces -Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> <tagBase>https://svn.jboss.org/repos/richfaces/modules/tests/metamer/ta... <branchBase>https://svn.jboss.org/repos/richfaces/modules/tests/metamer... </configuration>