[richfaces-svn-commits] JBoss Rich Faces SVN: r15947 - in branches/sandbox/3.3.X_JSF2/samples: richfaces-demo and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Nov 20 12:02:34 EST 2009
Author: amarkhel
Date: 2009-11-20 12:02:34 -0500 (Fri, 20 Nov 2009)
New Revision: 15947
Modified:
branches/sandbox/3.3.X_JSF2/samples/pom.xml
branches/sandbox/3.3.X_JSF2/samples/richfaces-demo/pom.xml
branches/sandbox/3.3.X_JSF2/samples/themes/pom.xml
Log:
Fix build for richfaces-demo
Modified: branches/sandbox/3.3.X_JSF2/samples/pom.xml
===================================================================
--- branches/sandbox/3.3.X_JSF2/samples/pom.xml 2009-11-20 15:37:27 UTC (rev 15946)
+++ branches/sandbox/3.3.X_JSF2/samples/pom.xml 2009-11-20 17:02:34 UTC (rev 15947)
@@ -476,12 +476,12 @@
</profile>
</profiles>
<modules>
- <!--<module>skins</module>
+ <module>skins</module>
<module>laguna</module>
<module>glassX</module>
- <module>darkX</module>-->
+ <module>darkX</module>
<module>richfaces-demo</module>
- <!--<module>themes</module>-->
- <!--<module>violetRays</module>-->
+ <module>themes</module>
+ <module>violetRays</module>
</modules>
</project>
Modified: branches/sandbox/3.3.X_JSF2/samples/richfaces-demo/pom.xml
===================================================================
--- branches/sandbox/3.3.X_JSF2/samples/richfaces-demo/pom.xml 2009-11-20 15:37:27 UTC (rev 15946)
+++ branches/sandbox/3.3.X_JSF2/samples/richfaces-demo/pom.xml 2009-11-20 17:02:34 UTC (rev 15947)
@@ -1,10 +1,14 @@
<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/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.3.3-jsf2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>richfaces-demo</artifactId>
- <version>3.3.3-jsf2-SNAPSHOT</version>
<packaging>war</packaging>
<name>richfaces-demo Maven Webapp</name>
@@ -177,23 +181,52 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_12</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</profile>
- </profiles>
- <dependencies>
- <dependency>
+ <profile>
+ <id>jsf2</id>
+ <dependencies>
+ <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.0.1</version>
- </dependency><dependency>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.el</artifactId>
+ <groupId>el-api</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.el</artifactId>
+ <groupId>el-api</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+ <dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>3.1.0.CR1</version>
+ <version>3.1.0.GA</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -201,6 +234,21 @@
<version>1.4.2</version>
</dependency>
<dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>laguna</artifactId>
+ <version>3.3.3-jsf2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>glassX</artifactId>
+ <version>3.3.3-jsf2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>darkX</artifactId>
+ <version>3.3.3-jsf2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<version>3.3.3-jsf2-SNAPSHOT</version>
@@ -237,6 +285,12 @@
<artifactId>nekohtml</artifactId>
<version>0.9.5</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -264,7 +318,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- <version>2.1.0.SP1</version>
+ <version>2.2.0.GA</version>
<exclusions>
<exclusion>
<groupId>org.richfaces.framework</groupId>
@@ -283,8 +337,18 @@
<groupId>javax.servlet</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>themes</artifactId>
+ <version>3.3.3-jsf2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>violetRays</artifactId>
+ <version>3.3.3-jsf2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
@@ -313,7 +377,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
- <version>2.1.0.SP1</version>
+ <version>2.2.0.GA</version>
<exclusions>
<exclusion>
<artifactId>jsf-api</artifactId>
@@ -328,7 +392,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
- <version>2.1.0.SP1</version>
+ <version>2.2.0.GA</version>
<exclusions>
<exclusion>
<artifactId>jsf-api</artifactId>
@@ -354,19 +418,12 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
+ <version>3.4.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.6.ga</version>
-
- <exclusions>
- <exclusion>
- <artifactId>commons-collections</artifactId>
- <groupId>commons-collections</groupId>
- </exclusion>
- </exclusions>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.2.GA</version>
</dependency>
</dependencies>
</project>
Modified: branches/sandbox/3.3.X_JSF2/samples/themes/pom.xml
===================================================================
--- branches/sandbox/3.3.X_JSF2/samples/themes/pom.xml 2009-11-20 15:37:27 UTC (rev 15946)
+++ branches/sandbox/3.3.X_JSF2/samples/themes/pom.xml 2009-11-20 17:02:34 UTC (rev 15947)
@@ -25,7 +25,19 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
More information about the richfaces-svn-commits
mailing list