You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2006/06/12 22:47:42 UTC

svn commit: r413741 - in /myfaces: maven/trunk/build-world.sh tomahawk/trunk/sandbox/core/pom.xml tomahawk/trunk/sandbox/examples/pom.xml

Author: baranda
Date: Mon Jun 12 13:47:42 2006
New Revision: 413741

URL: http://svn.apache.org/viewvc?rev=413741&view=rev
Log:
Sandbox now uses the same system introduced by wendy to build with myfaces / jsf-ri. Maybe this fixes too the nightly build process?

Modified:
    myfaces/maven/trunk/build-world.sh
    myfaces/tomahawk/trunk/sandbox/core/pom.xml
    myfaces/tomahawk/trunk/sandbox/examples/pom.xml

Modified: myfaces/maven/trunk/build-world.sh
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/build-world.sh?rev=413741&r1=413740&r2=413741&view=diff
==============================================================================
--- myfaces/maven/trunk/build-world.sh (original)
+++ myfaces/maven/trunk/build-world.sh Mon Jun 12 13:47:42 2006
@@ -79,7 +79,7 @@
 mvn clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
 cd ../..
 cd sandbox
-mvn -Pgenerate-assembly,myfaces clean install
+mvn -Pgenerate-assembly clean install
 cd assembly
 mvn clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
 cd ../../..

Modified: myfaces/tomahawk/trunk/sandbox/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/pom.xml?rev=413741&r1=413740&r2=413741&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/pom.xml Mon Jun 12 13:47:42 2006
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>1.1.3</version>
+            <version>1.1.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
-            <version>1.1.3</version>
+            <version>1.1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

Modified: myfaces/tomahawk/trunk/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/pom.xml?rev=413741&r1=413740&r2=413741&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/pom.xml Mon Jun 12 13:47:42 2006
@@ -73,7 +73,9 @@
         <profile>
             <id>myfaces</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>!jsf</name>
+                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -101,6 +103,12 @@
         <!-- To use the examples using the Sun's JSF Reference Implementation -->
         <profile>
             <id>jsfri</id>
+            <activation>
+                <property>
+                    <name>jsf</name>
+                    <value>ri</value>
+                </property>
+            </activation>
             <dependencies>
                 <dependency>
                     <groupId>javax.faces</groupId>