Author: manaRH Date: 2012-05-29 04:19:52 -0400 (Tue, 29 May 2012) New Revision: 14800 Modified: branches/enterprise/WFK-2_0/bom/pom.xml branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/blog/blog-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/booking/booking-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/drools/drools-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/drools/drools-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ear/pom.xml branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/excel/excel-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/excel/excel-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/excel/excel-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/groovybooking/groovybooking-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/guice/guice-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/itext/itext-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/mail/mail-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/pom.xml branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/registration/registration-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/spring/spring-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/pom.xml branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/todo/todo-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/todo/todo-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/ui/ui-ejb/pom.xml branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml branches/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml branches/enterprise/WFK-2_0/jboss-seam-debug/pom.xml branches/enterprise/WFK-2_0/jboss-seam-excel/pom.xml branches/enterprise/WFK-2_0/jboss-seam-ioc/pom.xml branches/enterprise/WFK-2_0/jboss-seam-mail/pom.xml branches/enterprise/WFK-2_0/jboss-seam-pdf/pom.xml branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml branches/enterprise/WFK-2_0/jboss-seam/pom.xml branches/enterprise/WFK-2_0/pom.xml branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml Log: changed dependency versions to EAP6 MEAD repo Modified: branches/enterprise/WFK-2_0/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/bom/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/bom/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,17 +32,16 @@ <properties> <!-- Version string properties --> <version.seam>2.3.0.Beta2-redhat-1</version.seam> - <version.wicket>1.4.14</version.wicket> - <version.drools>5.1.1</version.drools> + <version.drools>5.2.2.BRMS</version.drools> <version.resteasy>2.0.1.GA</version.resteasy> <version.spring>3.1.1.RELEASE</version.spring> - <version.jbossas7>7.1.1.Final</version.jbossas7> - <version.jsf2>2.1.7</version.jsf2> + <version.jbossas7>7.1.2.Final-redhat-1</version.jbossas7> + <version.jsf2>2.1.7-redhat-1</version.jsf2> <version.webdriver>0.9.7376</version.webdriver> - <version.infinispan>5.1.3.FINAL</version.infinispan> + <version.infinispan>5.1.3.FINAL-redhat-1</version.infinispan> <version.junit>4.8.2</version.junit> <version.testng>5.14.10</version.testng> - <version.richfaces>4.2.2.Final</version.richfaces> + <version.richfaces>4.2.2.Final-redhat-1</version.richfaces> <version.arquillian_core>1.0.0.Final</version.arquillian_core> @@ -63,7 +62,7 @@ <dependency> <groupId>org.jboss.bom</groupId> <artifactId>jboss-javaee-6.0-with-hibernate</artifactId> - <version>1.0.0.M6</version> + <version>1.0.0.M11-redhat-1</version> <type>pom</type> <scope>import</scope> </dependency> @@ -157,18 +156,6 @@ <version>${version.seam}</version> </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-rss</artifactId> - <version>${version.seam}</version> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-wicket</artifactId> - <version>${version.seam}</version> - </dependency> - <!-- thirdparty dependencies --> <dependency> <groupId>antlr</groupId> @@ -332,59 +319,59 @@ <version>3.1-jbossorg-1</version> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>1.0.0.CR8</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>apache-slide</groupId> - <artifactId>webdavlib</artifactId> - </exclusion> - <exclusion> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - </exclusion> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaf</groupId> - <artifactId>activation</artifactId> - </exclusion> - </exclusions> - </dependency> +<!-- <dependency> --> +<!-- <groupId>jboss</groupId> --> +<!-- <artifactId>jbossxb</artifactId> --> +<!-- <version>1.0.0.CR8</version> --> +<!-- <exclusions> --> +<!-- <exclusion> --> +<!-- <groupId>jboss</groupId> --> +<!-- <artifactId>jboss-logging-spi</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>jboss</groupId> --> +<!-- <artifactId>jboss-common-core</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>apache-xerces</groupId> --> +<!-- <artifactId>xml-apis</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>apache-httpclient</groupId> --> +<!-- <artifactId>commons-httpclient</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>apache-slide</groupId> --> +<!-- <artifactId>webdavlib</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>oswego-concurrent</groupId> --> +<!-- <artifactId>concurrent</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>wutka-dtdparser</groupId> --> +<!-- <artifactId>dtdparser121</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>apache-xerces</groupId> --> +<!-- <artifactId>xercesImpl</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>javax.activation</groupId> --> +<!-- <artifactId>activation</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>sun-jaf</groupId> --> +<!-- <artifactId>activation</artifactId> --> +<!-- </exclusion> --> +<!-- </exclusions> --> +<!-- </dependency> --> <!-- Excel export module dependency --> <dependency> <groupId>net.sourceforge.jexcelapi</groupId> <artifactId>jxl</artifactId> - <version>2.6.8-seam</version> + <version>2.6.10</version> <exclusions> <exclusion> <groupId>log4j</groupId> @@ -418,9 +405,9 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.12.0.GA</version> + <version>3.15.0.GA-redhat-1</version> </dependency> <dependency> @@ -432,7 +419,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4</version> + <version>1.4.2</version> </dependency> <dependency> @@ -624,12 +611,6 @@ </dependency> <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>jboss-embedded-api</artifactId> - <version>${version.jbossembedded}</version> - </dependency> - - <dependency> <groupId>org.opensymphony.quartz</groupId> <artifactId>quartz</artifactId> <version>1.6.5</version> @@ -739,7 +720,7 @@ <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> - <version>2.1.2</version> + <version>2.1.7</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -760,7 +741,7 @@ <dependency> <groupId>com.lowagie</groupId> <artifactId>itext-rtf</artifactId> - <version>2.1.2</version> + <version>2.1.7</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -880,68 +861,6 @@ </dependency> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket</artifactId> - <version>${version.wicket}</version> - <exclusions> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-ioc</artifactId> - <version>${version.wicket}</version> - <exclusions> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> - <version>${version.wicket}</version> - <exclusions> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-datetime</artifactId> - <version>${version.wicket}</version> - </dependency> - - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>${version.testng}</version> Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ear/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -258,7 +258,7 @@ <artifactId>jta</artifactId> </exclusion> <exclusion> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/blog-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -99,7 +99,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> @@ -268,7 +268,7 @@ <artifactId>jta</artifactId> </exclusion> <exclusion> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> </exclusions> Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/blog-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -92,7 +92,7 @@ <artifactId>dom4j</artifactId> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/blog/blog-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/blog/blog-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/blog/blog-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/booking/booking-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/booking/booking-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/booking/booking-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -55,7 +55,7 @@ </exclusion> <exclusion> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </exclusion> <exclusion> <groupId>javax.el</groupId> @@ -65,7 +65,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/booking/booking-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>javax.mail</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -35,7 +35,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -86,7 +86,7 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/contactlist/contactlist-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -69,7 +69,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/drools/drools-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/drools/drools-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/drools/drools-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/drools/drools-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/drools/drools-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/drools/drools-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.jboss.spec.javax.el</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -30,7 +30,7 @@ </exclusion> <exclusion> <artifactId>javassist</artifactId> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> </exclusion> </exclusions> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -87,7 +87,7 @@ <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> @@ -126,7 +126,7 @@ <artifactId>bsh</artifactId> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -31,7 +31,7 @@ </exclusion> <exclusion> <artifactId>javassist</artifactId> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> </exclusion> </exclusions> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/excel/excel-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/excel/excel-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/excel/excel-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -38,7 +38,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/excel/excel-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/excel/excel-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/excel/excel-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -98,10 +98,6 @@ <artifactId>jboss-seam-pdf</artifactId> </dependency> <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-rss</artifactId> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.el</groupId> <artifactId>jboss-el-api_2.2_spec</artifactId> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/excel/excel-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/excel/excel-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/excel/excel-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -60,7 +60,7 @@ <artifactId>jboss-seam-debug</artifactId> <exclusions> <exclusion> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <groupId>org.jboss.spec.javax.faces</groupId> </exclusion> </exclusions> Modified: branches/enterprise/WFK-2_0/examples-ee6/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -74,10 +74,11 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> - <dependency> +<!-- <dependency> <groupId>org.eclipse.jdt</groupId> <artifactId>core</artifactId> </dependency> +--> <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> @@ -101,10 +102,6 @@ <artifactId>drools-templates</artifactId> </dependency> <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-api</artifactId> - </dependency> - <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> </dependency> @@ -115,7 +112,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/guice/guice-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/guice/guice-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/guice/guice-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -30,7 +30,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/hibernate/hibernate-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -85,7 +85,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/itext/itext-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/itext/itext-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/itext/itext-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/itext/itext-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -89,7 +89,7 @@ <artifactId>dom4j</artifactId> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/jpa/jpa-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -82,7 +82,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> @@ -169,7 +169,7 @@ <artifactId>ejb3-persistence</artifactId> </exclusion> <exclusion> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> <exclusion> @@ -320,7 +320,7 @@ <artifactId>ejb3-persistence</artifactId> </exclusion> <exclusion> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> <exclusion> @@ -368,7 +368,7 @@ <artifactId>jboss-common-core</artifactId> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/mail/mail-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/mail/mail-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/mail/mail-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/mail/mail-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -44,7 +44,7 @@ <groupId>com.sun.faces</groupId> </exclusion> <exclusion> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <groupId>org.jboss.spec.javax.faces</groupId> </exclusion> </exclusions> @@ -76,7 +76,7 @@ <groupId>org.jboss.seam</groupId> </exclusion> <exclusion> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <groupId>org.jboss.spec.javax.faces</groupId> </exclusion> </exclusions> @@ -88,7 +88,7 @@ <scope>runtime</scope> <exclusions> <exclusion> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <groupId>org.jboss.spec.javax.faces</groupId> </exclusion> </exclusions> Modified: branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/messages/messages-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -77,7 +77,7 @@ </exclusion> <exclusion> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </exclusion> <exclusion> <groupId>javax.el</groupId> @@ -87,7 +87,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/metawidget/booking/booking-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>javax.mail</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -37,7 +37,7 @@ </exclusion> <exclusion> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </exclusion> <exclusion> <groupId>javax.el</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.testng</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -72,7 +72,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/numberguess/numberguess-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -33,7 +33,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.testng</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -19,7 +19,7 @@ <module>booking</module> <module>contactlist</module> <module>drools</module> - <module>dvdstore</module> +<!-- <module>dvdstore</module> --> <module>excel</module> <module>groovybooking</module> <module>guice</module> @@ -28,8 +28,9 @@ <module>jpa</module> <module>mail</module> <module>messages</module> - <module>metawidget/booking</module> +<!-- <module>metawidget/booking</module> <module>metawidget/groovybooking</module> +--> <module>nestedbooking</module> <!-- <module>numberguess</module> --> <module>openid</module> @@ -46,7 +47,7 @@ <module>seamspace</module> <module>spring</module> <module>tasks</module> - <module>todo</module> +<!-- <module>todo</module> --> <module>ui</module> </modules> @@ -102,37 +103,16 @@ </build> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${project.version}</version> - <type>ejb</type> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <artifactId>el-api</artifactId> - <groupId>javax.el</groupId> - </exclusion> - </exclusions> - </dependency> - + <dependencies> + <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> - <version>${richfaces.version}</version> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> <type>pom</type> <scope>import</scope> </dependency> - - <!-- common provided scope dependencies --> + <!-- common provided scope dependencies --> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -146,42 +126,13 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - <version>${richfaces.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - <version>${richfaces.version}</version> - </dependency> - <!-- common test scope dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>${slf4j.version}</version> </dependency> - - <!-- <dependency> - <groupId>org.metawidget</groupId> - <artifactId>metawidget-backend</artifactId> - <version>0.95</version> - </dependency> - <dependency> - <groupId>org.metawidget</groupId> - <artifactId>metawidget-frontend</artifactId> - <version>0.95</version> - </dependency> - - <dependency> - <groupId>org.metawidget</groupId> - <artifactId>metawidget</artifactId> - <version>0.95</version> - </dependency>--> - <dependency> <groupId>org.apache.myfaces.trinidad</groupId> <artifactId>trinidad-api</artifactId> @@ -998,7 +949,6 @@ <!-- Excluded TestNG groups (ex: slow annotated tests won't run during the test phase) --> <tests.excludedGroups>slow</tests.excludedGroups> - <richfaces.version>4.2.2.Final</richfaces.version> <slf4j.version>1.6.1</slf4j.version> <!-- dependencies for functional tests --> Modified: branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -29,7 +29,7 @@ </exclusion> <exclusion> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </exclusion> <exclusion> <groupId>javax.el</groupId> @@ -64,7 +64,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/quartz/quartz-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.hibernate.javax.persistence</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/registration/registration-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/registration/registration-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/registration/registration-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -29,7 +29,7 @@ </exclusion> <exclusion> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </exclusion> <exclusion> <groupId>javax.el</groupId> @@ -54,7 +54,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/registration/registration-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -56,7 +56,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -46,7 +46,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/restbay/restbay-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -47,7 +47,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -46,7 +46,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seambay/seambay-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.testng</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -38,7 +38,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.seleniumhq.selenium.server</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -46,7 +46,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seampay/seampay-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.testng</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -46,7 +46,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/seamspace/seamspace-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.testng</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/spring/spring-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/spring/spring-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/spring/spring-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -81,7 +81,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -46,7 +46,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/tasks/tasks-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.testng</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/todo/todo-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/todo/todo-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/todo/todo-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/examples-ee6/todo/todo-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/todo/todo-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/todo/todo-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -32,7 +32,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/ui/ui-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/ui/ui-ejb/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/ui/ui-ejb/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/ui/ui-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> Modified: branches/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/examples-ee6/ui/ui-web/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -56,7 +56,7 @@ <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/WFK-2_0/jboss-seam/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/jboss-seam/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -19,7 +19,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>antlr-maven-plugin</artifactId> - <version>2.2</version> <configuration> <grammars>org/jboss/seam/text/seam-text.g</grammars> </configuration> @@ -146,7 +145,7 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <scope>provided</scope> </dependency> @@ -402,7 +401,7 @@ <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/WFK-2_0/jboss-seam-debug/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam-debug/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/jboss-seam-debug/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -19,7 +19,7 @@ <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/WFK-2_0/jboss-seam-excel/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam-excel/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/jboss-seam-excel/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -25,7 +25,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/jboss-seam-ioc/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam-ioc/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/jboss-seam-ioc/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -56,7 +56,7 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <scope>provided</scope> </dependency> Modified: branches/enterprise/WFK-2_0/jboss-seam-mail/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam-mail/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/jboss-seam-mail/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -23,7 +23,7 @@ </dependency> <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> <dependency> Modified: branches/enterprise/WFK-2_0/jboss-seam-pdf/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam-pdf/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/jboss-seam-pdf/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -51,7 +51,7 @@ <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> </dependency> </dependencies> Modified: branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/jboss-seam-remoting/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -70,7 +70,7 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <type>jar</type> </dependency> Modified: branches/enterprise/WFK-2_0/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss</groupId> <artifactId>jboss-parent</artifactId> - <version>8</version> + <version>8-redhat-1</version> </parent> <groupId>org.jboss.seam</groupId> @@ -45,16 +45,14 @@ <!-- Version string properties --> <version.arquillian_core>1.0.0.Final</version.arquillian_core> - <version.wicket>1.4.14</version.wicket> - <version.drools>5.1.1</version.drools> + <version.drools>5.2.1.BRMS</version.drools> <version.testng>5.14.10</version.testng> <version.resteasy>2.0.1.GA</version.resteasy> - <version.jbossembedded>beta3.SP15</version.jbossembedded> - <version.jbossas7>7.1.1.Final</version.jbossas7> + <version.jbossas7>7.1.2.Final-redhat-1</version.jbossas7> <version.emma>2.0.5312</version.emma> - <version.jsf2>2.1.7</version.jsf2> + <version.jsf2>2.1.7-redhat-1</version.jsf2> <version.junit>4.8.2</version.junit> - <version.richfaces>4.2.2.Final</version.richfaces> + <version.richfaces>4.2.2.Final-redhat-1</version.richfaces> <!-- ***************** --> <!-- Repository Deployment URLs --> @@ -104,147 +102,14 @@ <version>1.7.0</version> </dependency> - - <!-- You should adjust this in the initcore task in build.xml as well --> <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>2.2.0.CR6</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.4.1</version> + <version>2.6.20.Final</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>1.0.0.CR8</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>apache-slide</groupId> - <artifactId>webdavlib</artifactId> - </exclusion> - <exclusion> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - </exclusion> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaf</groupId> - <artifactId>activation</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- these 2 dependencies are for jboss-seam functionality --> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.3.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.3.GA</version> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.0.GA</version> - </dependency> - - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4</version> - </dependency> - - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - </dependency> - - <dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> - <version>1.3</version> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - - - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>2.2</version> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1-brew</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh</artifactId> <version>2.0b4</version> @@ -423,7 +288,7 @@ <!-- just for jboss-seam core as it is EJB type not jar --> <plugin> <artifactId>maven-ejb-plugin</artifactId> - <version>2.3</version> +<!-- <version>2.3</version> --> <configuration> <ejbVersion>3.0</ejbVersion> <archive> @@ -506,22 +371,22 @@ <module>jboss-seam-resteasy</module> <module>jboss-seam-ioc</module> <module>jboss-seam-jul</module> - <module>seam-integration-tests</module> + <module>seam-integration-tests</module> + <module>functional-tests</module> </modules> <profiles> <!-- Profile for generating Seam reference documentation --> - <profile> - <id>doc</id> - <modules> - <module>seam-reference-guide</module> - </modules> - </profile> +<!-- <profile> --> +<!-- <id>doc</id> --> +<!-- <modules> --> +<!-- <module>seam-reference-guide</module> --> +<!-- </modules> --> +<!-- </profile> --> <profile> <id>all</id> <modules> - <module>seam-reference-guide</module> - <module>functional-tests</module> +<!-- <module>seam-reference-guide</module> --> <module>examples-ee6</module> <module>distribution</module> </modules> @@ -529,7 +394,7 @@ <profile> <id>distribution</id> <modules> - <module>seam-reference-guide</module> +<!-- <module>seam-reference-guide</module> --> <module>distribution</module> </modules> </profile> Modified: branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml 2012-05-29 08:17:22 UTC (rev 14799) +++ branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml 2012-05-29 08:19:52 UTC (rev 14800) @@ -101,7 +101,7 @@ <dependency> <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency>