You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/06/18 01:14:36 UTC

svn commit: r785852 - in /myfaces/trinidad/branches/1.2.11.4-branch: ./ trinidad-api/ trinidad-assembly/ trinidad-build/ trinidad-examples/ trinidad-examples/trinidad-blank/ trinidad-examples/trinidad-demo/ trinidad-examples/trinidad-example-assembly/ ...

Author: matzew
Date: Wed Jun 17 23:14:35 2009
New Revision: 785852

URL: http://svn.apache.org/viewvc?rev=785852&view=rev
Log:
updating some version numbers on a branch

Modified:
    myfaces/trinidad/branches/1.2.11.4-branch/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-assembly/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-build/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-blank/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-demo/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-example-assembly/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-partial-lifecycle/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-build/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-demo/pom.xml
    myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-impl/pom.xml

Modified: myfaces/trinidad/branches/1.2.11.4-branch/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/pom.xml Wed Jun 17 23:14:35 2009
@@ -34,7 +34,7 @@
 
   <groupId>org.apache.myfaces.trinidad</groupId>
   <artifactId>trinidad</artifactId>
-  <version>1.2.11.3-SNAPSHOT</version>
+  <version>1.2.11.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-api</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-assembly/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-assembly/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-assembly/pom.xml Wed Jun 17 23:14:35 2009
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-assembly</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-build/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-build/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-build/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-build/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-build</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-example</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-blank/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-blank/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-blank/pom.xml Wed Jun 17 23:14:35 2009
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad-example</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-blank</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-demo/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-demo/pom.xml Wed Jun 17 23:14:35 2009
@@ -1,272 +1,272 @@
-<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>
-
-  <name>Apache MyFaces Trinidad Demo</name>
-  <description>Apache MyFaces Trinidad Demo</description>
-
-  <parent>
-    <groupId>org.apache.myfaces.trinidad</groupId>
-    <artifactId>trinidad-example</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>trinidad-demo</artifactId>
-  <packaging>war</packaging>
-  
-  
-
-  <dependencies>
-    
-    <!--<dependency>
-      <groupId>org.apache.myfaces.trinidad</groupId>
-      <artifactId>trinidad-partial-lifecycle</artifactId>
-      <version>${project.version}</version>
-    </dependency>-->
-
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-    </dependency>
-    
-    <!-- For SourceCodeServlet -->
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.myfaces.trinidadbuild</groupId>
-        <artifactId>maven-jdev-plugin</artifactId>
-        <configuration>
-          <libraries>
-            <library>JSP Runtime</library>
-          </libraries>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>jettyConfig</id>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-api</artifactId>
-            <version>${jsf-ri.version}</version>
-            <scope>compile</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-impl</artifactId>
-            <version>${jsf-ri.version}</version>
-            <scope>runtime</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${jsf-myfaces.version}</version>
-            <scope>compile</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>${jsf-myfaces.version}</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>maven-jetty-plugin</artifactId>
-            <configuration>
-              <scanIntervalSeconds>10</scanIntervalSeconds>
-            </configuration>
-          </plugin>
-       </plugins>
-     </build>
-   </profile>
-    
-   <!-- sets up the webapp for deployment to pluto  "mvn clean install -Ppluto" -->    
-   <profile>
-     <id>pluto</id>
-     <dependencies>
-        <dependency>
-	       <groupId>org.apache.myfaces.portlet-bridge</groupId>
-		    <artifactId>portlet-bridge-api</artifactId>
-		  </dependency>
-		  
-		  <dependency>
-		    <groupId>org.apache.myfaces.portlet-bridge</groupId>
-		    <artifactId>portlet-bridge-impl</artifactId>
-		  </dependency>		  
-
-        <dependency>
-          <groupId>${pluto.package}</groupId>
-          <artifactId>pluto-util</artifactId>
-        </dependency>
-		</dependencies>
-      
-      <build>
-        <plugins>
-          <!-- configure maven-war-plugin to use updated web.xml -->
-          <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-              <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>${pluto.package}</groupId>
-            <artifactId>maven-pluto-plugin</artifactId>
-          </plugin>  
-        </plugins>
-      </build>
-    </profile>
-    
-    <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
-    <profile>
-      <id>pluto-embedded</id>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-api</artifactId>
-            <version>${jsf-ri.version}</version>
-            <scope>compile</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-impl</artifactId>
-            <version>${jsf-ri.version}</version>
-            <scope>runtime</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${jsf-myfaces.version}</version>
-            <scope>compile</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <scope>runtime</scope>
-            <version>${jsf-myfaces.version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>${portlet.version}</version>
-            <scope>compile</scope>
-          </dependency>
-
-        </dependencies>
-      </dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>com.bekk.boss</groupId>
-          <artifactId>maven-jetty-pluto-embedded</artifactId>
-        </dependency>
-        <dependency>
-	       <groupId>org.apache.myfaces.portlet-bridge</groupId>
-		    <artifactId>portlet-bridge-api</artifactId>
-		    <scope>compile</scope>
-		  </dependency>
-		  <dependency>
-		    <groupId>org.apache.myfaces.portlet-bridge</groupId>
-		    <artifactId>portlet-bridge-impl</artifactId>
-		    <scope>runtime</scope>
-		  </dependency>
-      </dependencies>
-		
-		<build>      
-        <plugins>
-          <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>maven-jetty-plugin</artifactId>
-            <configuration>
-              <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-              <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
-              <systemProperties>
-                <systemProperty>
-                  <name>org.apache.pluto.embedded.portletIds</name>
-                  <value>trinidad_demo</value>
-                </systemProperty>
-              </systemProperties>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>${pluto.package}</groupId>
-            <artifactId>maven-pluto-plugin</artifactId>
-          </plugin>  
-        </plugins>
-      </build>  
-    </profile>
-    
-    <!-- Runs the portal testcases in Pluto 2.0 -->
-    <profile>
-      <id>portlet20</id>
-      <activation>
-        <property>
-          <name>portlet</name>
-          <value>2.0</value>
-        </property>
-      </activation>
-      <repositories>
-        <repository>
-          <id>BOSS inhouse private</id>
-          <url>http://boss.bekk.no/proximity/repository/private</url>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-        </repository>
-      </repositories>
-      <properties>
-        <portlet-bridge.version>2.0.0-SNAPSHOT</portlet-bridge.version>
-        <pluto-embedded.version>2.0-SNAPSHOT</pluto-embedded.version>
-        <portlet.version>2.0</portlet.version>
-        <pluto.version>2.0.0-SNAPSHOT</pluto.version>
-        <pluto.package>org.apache.portals.pluto</pluto.package>
-      </properties>
-    </profile>
-  </profiles>
-</project>
+<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>
+
+  <name>Apache MyFaces Trinidad Demo</name>
+  <description>Apache MyFaces Trinidad Demo</description>
+
+  <parent>
+    <groupId>org.apache.myfaces.trinidad</groupId>
+    <artifactId>trinidad-example</artifactId>
+    <version>1.2.11.4-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>trinidad-demo</artifactId>
+  <packaging>war</packaging>
+  
+  
+
+  <dependencies>
+    
+    <!--<dependency>
+      <groupId>org.apache.myfaces.trinidad</groupId>
+      <artifactId>trinidad-partial-lifecycle</artifactId>
+      <version>${project.version}</version>
+    </dependency>-->
+
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.portlet</groupId>
+      <artifactId>portlet-api</artifactId>
+    </dependency>
+    
+    <!-- For SourceCodeServlet -->
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.myfaces.trinidadbuild</groupId>
+        <artifactId>maven-jdev-plugin</artifactId>
+        <configuration>
+          <libraries>
+            <library>JSP Runtime</library>
+          </libraries>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>jettyConfig</id>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>javax.faces</groupId>
+            <artifactId>jsf-api</artifactId>
+            <version>${jsf-ri.version}</version>
+            <scope>compile</scope>
+          </dependency>
+
+          <dependency>
+            <groupId>javax.faces</groupId>
+            <artifactId>jsf-impl</artifactId>
+            <version>${jsf-ri.version}</version>
+            <scope>runtime</scope>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <version>${jsf-myfaces.version}</version>
+            <scope>compile</scope>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-impl</artifactId>
+            <version>${jsf-myfaces.version}</version>
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>maven-jetty-plugin</artifactId>
+            <configuration>
+              <scanIntervalSeconds>10</scanIntervalSeconds>
+            </configuration>
+          </plugin>
+       </plugins>
+     </build>
+   </profile>
+    
+   <!-- sets up the webapp for deployment to pluto  "mvn clean install -Ppluto" -->    
+   <profile>
+     <id>pluto</id>
+     <dependencies>
+        <dependency>
+	       <groupId>org.apache.myfaces.portlet-bridge</groupId>
+		    <artifactId>portlet-bridge-api</artifactId>
+		  </dependency>
+		  
+		  <dependency>
+		    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+		    <artifactId>portlet-bridge-impl</artifactId>
+		  </dependency>		  
+
+        <dependency>
+          <groupId>${pluto.package}</groupId>
+          <artifactId>pluto-util</artifactId>
+        </dependency>
+		</dependencies>
+      
+      <build>
+        <plugins>
+          <!-- configure maven-war-plugin to use updated web.xml -->
+          <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+              <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>${pluto.package}</groupId>
+            <artifactId>maven-pluto-plugin</artifactId>
+          </plugin>  
+        </plugins>
+      </build>
+    </profile>
+    
+    <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
+    <profile>
+      <id>pluto-embedded</id>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>javax.faces</groupId>
+            <artifactId>jsf-api</artifactId>
+            <version>${jsf-ri.version}</version>
+            <scope>compile</scope>
+          </dependency>
+
+          <dependency>
+            <groupId>javax.faces</groupId>
+            <artifactId>jsf-impl</artifactId>
+            <version>${jsf-ri.version}</version>
+            <scope>runtime</scope>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <version>${jsf-myfaces.version}</version>
+            <scope>compile</scope>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-impl</artifactId>
+            <scope>runtime</scope>
+            <version>${jsf-myfaces.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>${portlet.version}</version>
+            <scope>compile</scope>
+          </dependency>
+
+        </dependencies>
+      </dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>com.bekk.boss</groupId>
+          <artifactId>maven-jetty-pluto-embedded</artifactId>
+        </dependency>
+        <dependency>
+	       <groupId>org.apache.myfaces.portlet-bridge</groupId>
+		    <artifactId>portlet-bridge-api</artifactId>
+		    <scope>compile</scope>
+		  </dependency>
+		  <dependency>
+		    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+		    <artifactId>portlet-bridge-impl</artifactId>
+		    <scope>runtime</scope>
+		  </dependency>
+      </dependencies>
+		
+		<build>      
+        <plugins>
+          <plugin>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>maven-jetty-plugin</artifactId>
+            <configuration>
+              <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+              <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+              <systemProperties>
+                <systemProperty>
+                  <name>org.apache.pluto.embedded.portletIds</name>
+                  <value>trinidad_demo</value>
+                </systemProperty>
+              </systemProperties>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>${pluto.package}</groupId>
+            <artifactId>maven-pluto-plugin</artifactId>
+          </plugin>  
+        </plugins>
+      </build>  
+    </profile>
+    
+    <!-- Runs the portal testcases in Pluto 2.0 -->
+    <profile>
+      <id>portlet20</id>
+      <activation>
+        <property>
+          <name>portlet</name>
+          <value>2.0</value>
+        </property>
+      </activation>
+      <repositories>
+        <repository>
+          <id>BOSS inhouse private</id>
+          <url>http://boss.bekk.no/proximity/repository/private</url>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+        </repository>
+      </repositories>
+      <properties>
+        <portlet-bridge.version>2.0.0-SNAPSHOT</portlet-bridge.version>
+        <pluto-embedded.version>2.0-SNAPSHOT</pluto-embedded.version>
+        <portlet.version>2.0</portlet.version>
+        <pluto.version>2.0.0-SNAPSHOT</pluto.version>
+        <pluto.package>org.apache.portals.pluto</pluto.package>
+      </properties>
+    </profile>
+  </profiles>
+</project>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-example-assembly/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-example-assembly/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-examples/trinidad-example-assembly/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-example-assembly</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-impl</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt Wed Jun 17 23:14:35 2009
@@ -1 +1 @@
-1_2_11_3
\ No newline at end of file
+1_2_11_4
\ No newline at end of file

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-partial-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-partial-lifecycle/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-partial-lifecycle/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-partial-lifecycle/pom.xml Wed Jun 17 23:14:35 2009
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
   <artifactId>trinidad-partial-lifecycle</artifactId>
   <name>Apache MyFaces Trinidad Partial Lifecycle</name>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-sandbox</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad-sandbox</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-sandbox-api</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-build/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-build/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-build/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-build/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad-sandbox</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-sandbox-build</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-demo/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-demo/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-demo/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad-sandbox</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-sandbox-demo</artifactId>

Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-impl/pom.xml?rev=785852&r1=785851&r2=785852&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-impl/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-impl/pom.xml Wed Jun 17 23:14:35 2009
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad-sandbox</artifactId>
-    <version>1.2.11.3-SNAPSHOT</version>
+    <version>1.2.11.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>trinidad-sandbox-impl</artifactId>