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 2006/06/05 13:55:17 UTC
svn commit: r411757 - in /portals/pluto/trunk: ./ maven-pluto-plugin/
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ pluto-ant-tasks/
pluto-container/ pluto-container/src/main/resources/org/apache/pluto/
pluto-descriptor-api/ pluto-descriptor...
Author: cdoremus
Date: Mon Jun 5 04:55:16 2006
New Revision: 411757
URL: http://svn.apache.org/viewvc?rev=411757&view=rev
Log:
Changed all version numbers to pluto-1.1.0-dev
Modified:
portals/pluto/trunk/dist-build.xml
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
portals/pluto/trunk/pluto-ant-tasks/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties
portals/pluto/trunk/pluto-descriptor-api/pom.xml
portals/pluto/trunk/pluto-descriptor-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
portals/pluto/trunk/pluto-site/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pluto-testsuite/src/main/webapp/WEB-INF/classes/expectedResults.properties
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/dist-build.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Mon Jun 5 04:55:16 2006
@@ -36,7 +36,7 @@
-->
<project name="PlutoDistributions" default="bin-dist">
- <property name="pluto.version" value="1.1.0-beta1" description="Version of Pluto 1.1 to build"/>
+ <property name="pluto.version" value="1.1.0-dev" description="Version of Pluto 1.1 to build"/>
<property name="tomcat.version" value="5.5.9" description="Version of Tomcat to deploy Pluto"/>
<property name="dist.basedir" value="target/dist" description="Base working directory"/>
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<!-- Put into maven default plugins group -->
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java Mon Jun 5 04:55:16 2006
@@ -25,7 +25,7 @@
*/
class InstallationDependency {
- public static final String VERSION = "1.1.0-beta1";
+ public static final String VERSION = "1.1.0-dev";
public static final InstallationDependency PORTLET_API =
new InstallationDependency("javax.portlet", "portlet-api", "1.0");
Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-ant-tasks</artifactId>
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties (original)
+++ portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties Mon Jun 5 04:55:16 2006
@@ -18,7 +18,7 @@
pluto.container.name=Pluto
pluto.container.version.major=1
-pluto.container.version.minor=1.0-beta1
+pluto.container.version.minor=1.0-dev
javax.portlet.version.major=1
javax.portlet.version.minor=0
Modified: portals/pluto/trunk/pluto-descriptor-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-descriptor-api/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-descriptor-api/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/trunk/pluto-descriptor-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-descriptor-impl/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-descriptor-impl/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-portal-driver</artifactId>
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-config.xml Mon Jun 5 04:55:16 2006
@@ -24,7 +24,7 @@
version="1.1">
<portal-name>pluto-portal-driver</portal-name>
- <portal-version>1.1.0-beta1</portal-version>
+ <portal-version>1.1.0-dev</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
Modified: portals/pluto/trunk/pluto-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site/pom.xml (original)
+++ portals/pluto/trunk/pluto-site/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.pluto</groupId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-taglib</artifactId>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-testsuite</artifactId>
Modified: portals/pluto/trunk/pluto-testsuite/src/main/webapp/WEB-INF/classes/expectedResults.properties
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/webapp/WEB-INF/classes/expectedResults.properties?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/webapp/WEB-INF/classes/expectedResults.properties (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/webapp/WEB-INF/classes/expectedResults.properties Mon Jun 5 04:55:16 2006
@@ -24,11 +24,11 @@
# The value we expect to return from renderRequest.getPortalContext().getPortalInfo();
-expected.serverInfo = Pluto/1.1.0-beta1
+expected.serverInfo = Pluto/1.1.0-dev
expected.version.major=1
expected.version.minor=0
-expected.portalInfo = pluto-portal-driver/1.1.0-beta1
+expected.portalInfo = pluto-portal-driver/1.1.0-dev
expected.security.role=tomcat
expected.security.role.mapped=plutoTestRole
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Mon Jun 5 04:55:16 2006
@@ -21,7 +21,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.pluto</groupId>
- <version>1.1.0-beta1</version>
+ <version>1.1.0-dev</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-util</artifactId>
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=411757&r1=411756&r2=411757&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Mon Jun 5 04:55:16 2006
@@ -23,7 +23,16 @@
<artifactId>pluto</artifactId>
<packaging>pom</packaging>
<name>Apache Pluto</name>
- <version>1.1.0-beta1</version>
+ <!--
+ Version numbers also need to be changed in
+ * All project pom.xml files,
+ * dist-build.xml in this directory,
+ * The pluto-portal-driver-config.xml in the pluto-portal module (src/main/webapp/WEB-INF),
+ * expectedResults.properties in the portal-testsuite module (src/main/webapp/WEB-INF/classes),
+ * environment.properties in pluto-container module (src/main/resources/org/apache/pluto) and
+ * InstallationDependancy.java in the maven-pluto-plugin module (src/main/java/org/apache/pluto/maven).
+ -->
+ <version>1.1.0-dev</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>