You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2007/08/09 15:20:09 UTC

svn commit: r564199 - in /portals/pluto/branches/1.1-286-trunk-merge: ./ assembly/ maven-pluto-plugin/ pluto-ant-tasks/ pluto-container/ pluto-descriptor-api/ pluto-descriptor-impl/ pluto-portal-driver-impl/ pluto-portal-driver/ pluto-portal/ pluto-sit...

Author: cdoremus
Date: Thu Aug  9 06:20:08 2007
New Revision: 564199

URL: http://svn.apache.org/viewvc?view=rev&rev=564199
Log:
Changed version number to 1.2.0-286-SNAPSHOT in all pom.xml files to avoid conflicts with the 1.1.0-286-COMPATIBILITY branch.

Modified:
    portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-ant-tasks/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver-impl/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site-skin/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-util/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/portlet2-api/pom.xml

Modified: portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml Thu Aug  9 06:20:08 2007
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>pluto</artifactId>
     <groupId>org.apache.pluto</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-286-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-286-SNAPSHOT</version>
+    <version>1.2.0-286-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-pluto-plugin</artifactId> 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-ant-tasks/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-ant-tasks/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-286-SNAPSHOT</version>
+    <version>1.2.0-286-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pluto-ant-tasks</artifactId> 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-286-SNAPSHOT</version>
+    <version>1.2.0-286-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/pom.xml Thu Aug  9 06:20:08 2007
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.pluto</groupId>
 		<artifactId>pluto</artifactId>
-		<version>1.1.0-286-SNAPSHOT</version>
+		<version>1.2.0-286-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.pluto</groupId>
 		<artifactId>pluto</artifactId>
-		<version>1.1.0-286-SNAPSHOT</version>
+		<version>1.2.0-286-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver-impl/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver-impl/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.pluto</groupId>
         <artifactId>pluto</artifactId>
-        <version>1.1.0-286-SNAPSHOT</version>
+        <version>1.2.0-286-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-portal-driver-impl</artifactId>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal-driver/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.pluto</groupId>
         <artifactId>pluto</artifactId>
-        <version>1.1.0-286-SNAPSHOT</version>
+        <version>1.2.0-286-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-portal-driver</artifactId>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.pluto</groupId>
         <artifactId>pluto</artifactId>
-        <version>1.1.0-286-SNAPSHOT</version>
+        <version>1.2.0-286-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site-skin/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site-skin/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site-skin/pom.xml Thu Aug  9 06:20:08 2007
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>pluto</artifactId>
         <groupId>org.apache.pluto</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0-286-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/pom.xml Thu Aug  9 06:20:08 2007
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>pluto</artifactId>
         <groupId>org.apache.pluto</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0-286-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/pom.xml Thu Aug  9 06:20:08 2007
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.pluto</groupId>
         <artifactId>pluto</artifactId>
-        <version>1.1.0-286-SNAPSHOT</version>
+        <version>1.2.0-286-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-taglib</artifactId>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-util/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-util/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-util/pom.xml Thu Aug  9 06:20:08 2007
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>pluto</artifactId>
     <groupId>org.apache.pluto</groupId>
-    <version>1.1.0-286-SNAPSHOT</version>
+    <version>1.2.0-286-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pluto-util</artifactId>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pom.xml Thu Aug  9 06:20:08 2007
@@ -18,7 +18,7 @@
      * The pluto-portal-driver-config.xml in the pluto-portal module (src/main/webapp/WEB-INF),
      * The pluto.container.version.major and pluto.container.version.minor properties (in this file)
     -->
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-286-SNAPSHOT</version>
     <!-- Due to a bug in maven 2.0, the description must not contain any line breaks or tabs. -->
     <description>Pluto is the Reference Implementation of the Java Portlet Specfication.</description>
     <url>http://portals.apache.org/pluto</url>

Modified: portals/pluto/branches/1.1-286-trunk-merge/portlet2-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/portlet2-api/pom.xml?view=diff&rev=564199&r1=564198&r2=564199
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/portlet2-api/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/portlet2-api/pom.xml Thu Aug  9 06:20:08 2007
@@ -27,7 +27,7 @@
  <parent>
    <groupId>org.apache.pluto</groupId>
    <artifactId>pluto</artifactId>
-   <version>1.1.0-286-SNAPSHOT</version>
+   <version>1.2.0-286-SNAPSHOT</version>
   </parent>
  
   <groupId>javax.portlet</groupId>