Author: nbelaevski Date: 2009-04-22 20:36:53 -0400 (Wed, 22 Apr 2009) New Revision: 13785 Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml trunk/test-applications/regressionArea/regressionArea-web/pom.xml Log: https://jira.jboss.org/jira/browse/RF-6894 Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-22 20:52:21 UTC (rev 13784) +++ trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-23 00:36:53 UTC (rev 13785) @@ -28,38 +28,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seamversion}</version> - <type>jar</type> - <exclusions> - <exclusion> - <artifactId>el-api</artifactId> - <groupId>javax.el</groupId> - </exclusion> - <exclusion> - <artifactId>javassist</artifactId> - <groupId>jboss</groupId> - </exclusion> - <exclusion> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ejb</artifactId> <version>${project.version}</version> @@ -85,10 +53,10 @@ <artifactId>javassist</artifactId> <groupId>jboss</groupId> </exclusion> - <exclusion> + <!--exclusion> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> - </exclusion> + </exclusion--> <!--exclusion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> @@ -199,15 +167,16 @@ </build> <properties> - <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome> - <jboss.installer.url>file:Y:\Distribs\jboss-4.2.3.GA.zip</jboss.installer.url> + <jboss.version>4.2.3.GA</jboss.version> + <jbosshome>${project.basedir}/target/installs/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome> + <jboss.installer.url>file:F:\Distribs\jboss-${jboss.version}.zip</jboss.installer.url> </properties> <profiles> <profile> <id>hudson</id> <properties> - <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jbo... + <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jbo... </properties> </profile> </profiles> Modified: trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-04-22 20:52:21 UTC (rev 13784) +++ trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-04-23 00:36:53 UTC (rev 13785) @@ -12,51 +12,21 @@ <packaging>ejb</packaging> <dependencies> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>${jsfversion}</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>${jsfversion}</version> - </dependency> - <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <version>${richversion}</version> </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${richversion}</version> - </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${jsfversion}</version> + <scope>provided</scope> + </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${richversion}</version> - </dependency> - <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-remoting</artifactId> + <artifactId>jboss-seam</artifactId> <version>${seamversion}</version> - <exclusions> - <exclusion> - <artifactId>javassist</artifactId> - <groupId>jboss</groupId> - </exclusion> - </exclusions> </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - <version>${seamversion}</version> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - <version>${seamversion}</version> - </dependency> <dependency> <groupId>log4j</groupId> Modified: trunk/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-22 20:52:21 UTC (rev 13784) +++ trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-23 00:36:53 UTC (rev 13785) @@ -17,6 +17,12 @@ <version>${richversion}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${seamversion}</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> @@ -46,8 +52,45 @@ <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>1.1.14</version> + <version>1.1.15.B1</version> </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-remoting</artifactId> + <version>${seamversion}</version> + <exclusions> + <exclusion> + <artifactId>javassist</artifactId> + <groupId>jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-seam</artifactId> + <groupId>org.jboss.seam</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>${seamversion}</version> + <exclusions> + <exclusion> + <artifactId>jboss-seam</artifactId> + <groupId>org.jboss.seam</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>${seamversion}</version> + <exclusions> + <exclusion> + <artifactId>jboss-seam</artifactId> + <groupId>org.jboss.seam</groupId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <finalName>regressionArea-web</finalName>