9:39 a.m.
Author: jbalunas(a)redhat.com
Date: 2010-05-21 10:39:13 -0400 (Fri, 21 May 2010)
New Revision: 17180
Modified:
root/build/bom/trunk/pom.xml
root/build/parent/trunk/pom.xml
root/commons/trunk/api/pom.xml
root/commons/trunk/bom/pom.xml
root/commons/trunk/parent/pom.xml
root/commons/trunk/pom.xml
root/core/trunk/api/pom.xml
root/core/trunk/bom/pom.xml
root/core/trunk/impl/pom.xml
root/core/trunk/parent/pom.xml
root/core/trunk/pom.xml
Log:
Update to allow changing of JSF api/impl using profiles
Modified: root/build/bom/trunk/pom.xml
===================================================================
--- root/build/bom/trunk/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/build/bom/trunk/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -1,21 +1,19 @@
<!--
- JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
- Inc. and individual contributors by the @authors tag. See the
- copyright.txt in the distribution for a full listing of
- individual contributors. This is free software; you can
- redistribute it and/or modify it under the terms of the GNU
- Lesser General Public License as published by the Free Software
- Foundation; either version 2.1 of the License, or (at your
- option) any later version. This software is distributed in the
- hope that it will be useful, but WITHOUT ANY WARRANTY; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU Lesser General Public License
- for more details. You should have received a copy of the GNU
- Lesser General Public License along with this software; if not,
- write to the Free Software Foundation, Inc., 51 Franklin St,
- Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
- http://www.fsf.org.
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc.
+ and individual contributors by the @authors tag. See the copyright.txt
+ in the distribution for a full listing of individual contributors. This
+ is free software; you can redistribute it and/or modify it under the
+ terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the hope that
+ it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details. You should have
+ received a copy of the GNU Lesser General Public License along with this
+ software; if not, write to the Free Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ site: http://www.fsf.org.
-->
<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">
@@ -30,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<description>
@@ -96,16 +94,15 @@
</dependency>
<!-- JSF 2 -->
+ <!--
+ This is set by default above, but can be overwritten by profiles
+ in richfaces-parent
+ -->
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <version>${jsf2.api.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- </dependency>
<!-- Misc -->
<dependency>
@@ -142,7 +139,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<build>
<plugins>
<!-- For the release this bom pom -->
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/build/parent/trunk/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -15,7 +15,8 @@
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
site: http://www.fsf.org.
-->
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
@@ -31,7 +32,8 @@
</parent>
<description>
- The Parent for all RichFaces sub-projects. This specifies build, plugin
+ The Parent for all RichFaces sub-projects. This specifies
+ build, plugin
and project meta-data.
</description>
@@ -57,7 +59,8 @@
</issueManagement>
<properties>
-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <project.reporting.outputEncoding>UTF-8
+ </project.reporting.outputEncoding>
</properties>
<!-- Repository management, including extra repositories if needed -->
@@ -127,6 +130,13 @@
<artifactId>junit</artifactId>
<version>4.4</version>
</dependency>
+ <!-- JSF imple is only a testing requirement -->
+ <!-- This is set by profiles below -->
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <version>${jsf2.impl.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -364,6 +374,89 @@
</clover.license.path>
</properties>
</profile>
+
+ <!--
+ The following profiles determine the JSF api/impl combinations that
+ will beused. The detfault profile is "jsf-ri", this can be
+ overwritten by setting -Djsf=[myfaces|mix] on the
+ mvn command line
+ -->
+ <profile>
+ <id>jsf-ri</id>
+ <activation>
+ <property>
+ <name>!jsf_profile</name>
+ </property>
+ </activation>
+ <properties>
+ <!-- Define jsf 2 api dependency -->
+ <jsf2.api.groupid>com.sun.faces</jsf2.api.groupid>
+ <jsf2.api.artifactid>jsf-api</jsf2.api.artifactid>
+ <jsf2.api.version>2.0.3-SNAPSHOT</jsf2.api.version>
+ <!-- Define jsf 2 impl dependency -->
+ <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid>
+ <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid>
+ <jsf2.impl.version>2.0.3-SNAPSHOT</jsf2.impl.version>
+ </properties>
+ </profile>
+ <profile>
+ <id>ri_202</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>ri_202</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- Define jsf 2 api dependency -->
+ <jsf2.api.groupid>com.sun.faces</jsf2.api.groupid>
+ <jsf2.api.artifactid>jsf-api</jsf2.api.artifactid>
+ <jsf2.api.version>2.0.2</jsf2.api.version>
+ <!-- Define jsf 2 impl dependency -->
+ <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid>
+ <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid>
+ <jsf2.impl.version>2.0.2</jsf2.impl.version>
+ </properties>
+ </profile>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>myfaces</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- Define jsf 2 api dependency -->
+ <jsf2.api.groupid>org.apache.myfaces.core</jsf2.api.groupid>
+ <jsf2.api.artifactid>myfaces-api</jsf2.api.artifactid>
+ <jsf2.api.version>2.0.0</jsf2.api.version>
+ <!-- Define jsf 2 impl dependency -->
+
<jsf2.impl.groupid>org.apache.myfaces.core</jsf2.impl.groupid>
+ <jsf2.impl.artifactid>myfaces-impl</jsf2.impl.artifactid>
+ <jsf2.impl.version>2.0.0</jsf2.impl.version>
+ </properties>
+ </profile>
+ <profile>
+ <id>myfaces-api-ri-impl</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>mix</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- Define jsf 2 api dependency -->
+ <jsf2.api.groupid>org.apache.myfaces.core</jsf2.api.groupid>
+ <jsf2.api.artifactid>myfaces-api</jsf2.api.artifactid>
+ <jsf2.api.version>2.0.0</jsf2.api.version>
+ <!-- Define jsf 2 impl dependency -->
+ <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid>
+ <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid>
+ <jsf2.impl.version>2.0.3-SNAPSHOT</jsf2.impl.version>
+ </properties>
+ </profile>
+
</profiles>
<distributionManagement>
@@ -374,8 +467,10 @@
<!-- SCM and distribution management -->
<scm>
-
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build...
-
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root...
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build...
+ </connection>
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root...
+ </developerConnection>
<url>http://fisheye.jboss.org/browse/richfaces</url>
</scm>
Modified: root/commons/trunk/api/pom.xml
===================================================================
--- root/commons/trunk/api/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/commons/trunk/api/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
- Inc. and individual contributors by the @authors tag. See the
- copyright.txt in the distribution for a full listing of
- individual contributors. This is free software; you can
- redistribute it and/or modify it under the terms of the GNU
- Lesser General Public License as published by the Free Software
- Foundation; either version 2.1 of the License, or (at your
- option) any later version. This software is distributed in the
- hope that it will be useful, but WITHOUT ANY WARRANTY; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU Lesser General Public License
- for more details. You should have received a copy of the GNU
- Lesser General Public License along with this software; if not,
- write to the Free Software Foundation, Inc., 51 Franklin St,
- Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
- http://www.fsf.org.
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc.
+ and individual contributors by the @authors tag. See the copyright.txt
+ in the distribution for a full listing of individual contributors. This
+ is free software; you can redistribute it and/or modify it under the
+ terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the hope that
+ it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details. You should have
+ received a copy of the GNU Lesser General Public License along with this
+ software; if not, write to the Free Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ site: http://www.fsf.org.
-->
<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
@@ -34,9 +32,10 @@
<dependencies>
<!-- Runtime Dependencies -->
+ <!-- JSF2 api version set by bom/richface-parent -->
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: root/commons/trunk/bom/pom.xml
===================================================================
--- root/commons/trunk/bom/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/commons/trunk/bom/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<description>
Modified: root/commons/trunk/parent/pom.xml
===================================================================
--- root/commons/trunk/parent/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/commons/trunk/parent/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<description>
Modified: root/commons/trunk/pom.xml
===================================================================
--- root/commons/trunk/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/commons/trunk/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.commons</groupId>
Modified: root/core/trunk/api/pom.xml
===================================================================
--- root/core/trunk/api/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/core/trunk/api/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -48,9 +48,10 @@
</dependency>
<!-- Provided dependencies -->
+ <!-- JSF2 api version set by bom/richface-parent -->
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: root/core/trunk/bom/pom.xml
===================================================================
--- root/core/trunk/bom/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/core/trunk/bom/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<description>
Modified: root/core/trunk/impl/pom.xml
===================================================================
--- root/core/trunk/impl/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/core/trunk/impl/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -57,8 +57,8 @@
<!-- Provided Dependencies -->
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -126,8 +126,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/core/trunk/parent/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<description>
Modified: root/core/trunk/pom.xml
===================================================================
--- root/core/trunk/pom.xml 2010-05-21 14:33:37 UTC (rev 17179)
+++ root/core/trunk/pom.xml 2010-05-21 14:39:13 UTC (rev 17180)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.core</groupId>