[richfaces-svn-commits] JBoss Rich Faces SVN: r15993 - in branches/community/3.3.X: framework/impl and 3 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Tue Nov 24 18:37:45 EST 2009


Author: nbelaevski
Date: 2009-11-24 18:37:45 -0500 (Tue, 24 Nov 2009)
New Revision: 15993

Modified:
   branches/community/3.3.X/framework/impl/pom.xml
   branches/community/3.3.X/pom.xml
   branches/community/3.3.X/test-applications/pom.xml
   branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml
   branches/community/3.3.X/test-applications/seamApp/web/pom.xml
Log:
JSF 2.0 configuration:

- added skip=true for Maven deploy plugin under jsf2_0 profile except richfaces-impl
- updated test-applications configuration
- removed unused RF dependencies from tests in regression-area application

Modified: branches/community/3.3.X/framework/impl/pom.xml
===================================================================
--- branches/community/3.3.X/framework/impl/pom.xml	2009-11-24 23:08:30 UTC (rev 15992)
+++ branches/community/3.3.X/framework/impl/pom.xml	2009-11-24 23:37:45 UTC (rev 15993)
@@ -162,6 +162,12 @@
 			<build>
 				<plugins>
 					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<configuration>
+							<skip>false</skip>
+						</configuration>
+					</plugin>
+					<plugin>
 						<artifactId>maven-jar-plugin</artifactId>
 						<configuration>
 							<classifier>jsf2</classifier>

Modified: branches/community/3.3.X/pom.xml
===================================================================
--- branches/community/3.3.X/pom.xml	2009-11-24 23:08:30 UTC (rev 15992)
+++ branches/community/3.3.X/pom.xml	2009-11-24 23:37:45 UTC (rev 15993)
@@ -233,6 +233,19 @@
 	</scm>
 	<profiles>
 		<profile>
+			<id>jsf2_0</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
 			<id>sandbox</id>
 			<modules>
 				<module>sandbox</module>

Modified: branches/community/3.3.X/test-applications/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/pom.xml	2009-11-24 23:08:30 UTC (rev 15992)
+++ branches/community/3.3.X/test-applications/pom.xml	2009-11-24 23:37:45 UTC (rev 15993)
@@ -78,30 +78,25 @@
 	
 	<dependencies>
 		<dependency>
-    			<artifactId>richfaces-ui</artifactId>
-    			<groupId>org.richfaces.ui</groupId>
-	    		<version>${rfVersion}</version>
+			<artifactId>richfaces-ui</artifactId>
+			<groupId>org.richfaces.ui</groupId>
+			<version>${rfVersion}</version>
 		</dependency>
 		<dependency>
-    			<artifactId>richfaces-impl</artifactId>
-    			<groupId>org.richfaces.framework</groupId>
-	    		<version>${rfVersion}</version>
+			<artifactId>richfaces-api</artifactId>
+			<groupId>org.richfaces.framework</groupId>
+			<version>${rfVersion}</version>
 		</dependency>
 		<dependency>
-    			<artifactId>richfaces-api</artifactId>
-    			<groupId>org.richfaces.framework</groupId>
-	    		<version>${rfVersion}</version>
-		</dependency>
-		<dependency>
 			  <artifactId>servlet-api</artifactId>
 			  <groupId>javax.servlet</groupId>
 			  <version>2.5</version>
 		</dependency>
 		<dependency>
-		    	  <groupId>javax.el</groupId> 
- 		        <artifactId>el-api</artifactId> 
-			  <version>1.0</version> 
-		        <scope>provided</scope> 
+			<groupId>javax.el</groupId> 
+			<artifactId>el-api</artifactId> 
+			<version>1.0</version> 
+			<scope>provided</scope> 
 		</dependency>
 	    <dependency>
 	      <groupId>com.uwyn</groupId>
@@ -123,6 +118,30 @@
 
 	<profiles>
 		<profile>
+			<id>jsf1_2</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.richfaces.framework</groupId>
+					<artifactId>richfaces-impl</artifactId>
+					<version>${rfVersion}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>jsf2_0</id>			
+			<dependencies>
+				<dependency>
+					<groupId>org.richfaces.framework</groupId>
+					<artifactId>richfaces-impl</artifactId>
+					<version>${rfVersion}</version>
+					<classifier>jsf2</classifier>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
 			<id>myfaces</id>
 			<dependencies>
 				<dependency>

Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml	2009-11-24 23:08:30 UTC (rev 15992)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml	2009-11-24 23:37:45 UTC (rev 15993)
@@ -29,17 +29,7 @@
             <artifactId>richfaces-api</artifactId>
             <version>${richversion}</version>
         </dependency>
-     	<dependency>
-            <groupId>org.richfaces.framework</groupId>
-            <artifactId>richfaces-impl</artifactId>
-            <version>${richversion}</version>
-        </dependency>
         <dependency>
-            <groupId>org.richfaces.ui</groupId>
-            <artifactId>richfaces-ui</artifactId>
-            <version>${richversion}</version>
-        </dependency>
-        <dependency>
             <groupId>javax.faces</groupId>
             <artifactId>jsf-api</artifactId>
 			<version>${jsfversion}</version>

Modified: branches/community/3.3.X/test-applications/seamApp/web/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/seamApp/web/pom.xml	2009-11-24 23:08:30 UTC (rev 15992)
+++ branches/community/3.3.X/test-applications/seamApp/web/pom.xml	2009-11-24 23:37:45 UTC (rev 15993)
@@ -55,11 +55,6 @@
 			<version>${rfVersion}</version>
 		</dependency>		
 		<dependency>
-			<groupId>org.richfaces.framework</groupId>
-			<artifactId>richfaces-impl</artifactId>
-			<version>${rfVersion}</version>
-		</dependency>
-		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui</artifactId>
 			<version>${rfVersion}</version>
@@ -121,4 +116,30 @@
 			</plugin>
 		</plugins>
 	</build>
+	<profiles>
+		<profile>
+			<id>jsf1_2</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.richfaces.framework</groupId>
+					<artifactId>richfaces-impl</artifactId>
+					<version>${rfVersion}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>jsf2_0</id>			
+			<dependencies>
+				<dependency>
+					<groupId>org.richfaces.framework</groupId>
+					<artifactId>richfaces-impl</artifactId>
+					<version>${rfVersion}</version>
+					<classifier>jsf2</classifier>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>



More information about the richfaces-svn-commits mailing list