Author: nbelaevski Date: 2008-03-23 10:53:26 -0400 (Sun, 23 Mar 2008) New Revision: 7092 Modified: trunk/samples/pom.xml trunk/samples/richfaces-demo/pom.xml Log: Changes from r7088 reverted Maven dependency plugin resurrected in richfaces-demo Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2008-03-22 18:41:17 UTC (rev 7091) +++ trunk/samples/pom.xml 2008-03-23 14:53:26 UTC (rev 7092) @@ -70,6 +70,11 @@ <version>3.2.0-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>1.1.14</version> @@ -375,6 +380,21 @@ </exclusions> </dependency> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.2.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> <version>${myfaces}</version> Modified: trunk/samples/richfaces-demo/pom.xml =================================================================== --- trunk/samples/richfaces-demo/pom.xml 2008-03-22 18:41:17 UTC (rev 7091) +++ trunk/samples/richfaces-demo/pom.xml 2008-03-23 14:53:26 UTC (rev 7092) @@ -13,7 +13,7 @@ <build> <finalName>richfaces-demo</finalName> <plugins> - <!--plugin> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> @@ -73,7 +73,7 @@ <argument>${project.build.directory}/richfaces/META-INF/rich.tld</argument> </arguments> </configuration> - </plugin--> + </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -187,6 +187,12 @@ <version>1.0</version> </dependency> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.2.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.8.1</version>