Author: jbalunas(a)redhat.com Date: 2010-09-28 20:17:46 -0400 (Tue, 28 Sep 2010) New Revision: 19359 Modified: trunk/archetypes/rf-gae-sample/pom.xml trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml trunk/archetypes/richfaces-archetype-simpleapp/pom.xml trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml Log: RF-9266 updated archetypes so that correct version is used in generated project Modified: trunk/archetypes/rf-gae-sample/pom.xml =================================================================== --- trunk/archetypes/rf-gae-sample/pom.xml 2010-09-28 20:54:35 UTC (rev 19358) +++ trunk/archetypes/rf-gae-sample/pom.xml 2010-09-29 00:17:46 UTC (rev 19359) @@ -17,6 +17,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- Setting this property for resource filtering so that generated project + uses correct version of richfaces. + --> + <archetype.project.version>${project.version}</archetype.project.version> </properties> <build> @@ -34,6 +38,12 @@ <extensions>true</extensions> </plugin> </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> </build> <profiles> Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-09-28 20:54:35 UTC (rev 19358) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-09-29 00:17:46 UTC (rev 19359) @@ -26,7 +26,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <org.richfaces.bom.version>4.0.0.20100826-M2</org.richfaces.bom.version> + <!-- Setting this property for resource filtering so that generated project + uses correct version of richfaces. + --> + <org.richfaces.bom.version>${archetype.project.version}</org.richfaces.bom.version> </properties> <build> Modified: trunk/archetypes/richfaces-archetype-simpleapp/pom.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-09-28 20:54:35 UTC (rev 19358) +++ trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-09-29 00:17:46 UTC (rev 19359) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.richfaces</groupId> @@ -17,6 +18,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- Setting this property for resource filtering so that generated project + uses correct version of richfaces. + --> + <archetype.project.version>${project.version}</archetype.project.version> </properties> <build> @@ -34,6 +39,12 @@ <extensions>true</extensions> </plugin> </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> </build> <profiles> @@ -76,7 +87,7 @@ </build> </profile> </profiles> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-09-28 20:54:35 UTC (rev 19358) +++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-09-29 00:17:46 UTC (rev 19359) @@ -31,7 +31,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> + <!-- Setting this property for resource filtering so that generated project + uses correct version of richfaces. + --> + <org.richfaces.bom.version>${archetype.project.version}</org.richfaces.bom.version> </properties> <build>