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 dd...@apache.org on 2006/08/24 04:18:31 UTC

svn commit: r434290 - 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: ddewolf
Date: Wed Aug 23 19:18:29 2006
New Revision: 434290

URL: http://svn.apache.org/viewvc?rev=434290&view=rev
Log:
Updating pom versions to match convention

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-portal/src/main/webapp/WEB-INF/web.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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/dist-build.xml (original)
+++ portals/pluto/trunk/dist-build.xml Wed Aug 23 19:18:29 2006
@@ -36,7 +36,7 @@
 -->
 <project name="PlutoDistributions" default="bin-dist">
 
-	<property name="pluto.version" value="1.1.0-dev" description="Version of Pluto 1.1 to build"/>
+	<property name="pluto.version" value="1.1.0-SNAPSHOT" 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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Wed Aug 23 19:18:29 2006
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&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 Wed Aug 23 19:18:29 2006
@@ -25,7 +25,7 @@
  */
 class InstallationDependency {
 
-	public static final String VERSION = "1.1.0-dev";
+	public static final String VERSION = "1.1.0-SNAPSHOT";
 
     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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Wed Aug 23 19:18:29 2006
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Wed Aug 23 19:18:29 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&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 Wed Aug 23 19:18:29 2006
@@ -18,7 +18,7 @@
 
 pluto.container.name=Pluto
 pluto.container.version.major=1
-pluto.container.version.minor=1.0-dev
+pluto.container.version.minor=1.1-0-SNAPSHOT
 
 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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-descriptor-api/pom.xml Wed Aug 23 19:18:29 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-descriptor-impl/pom.xml Wed Aug 23 19:18:29 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Wed Aug 23 19:18:29 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Wed Aug 23 19:18:29 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&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 Wed Aug 23 19:18:29 2006
@@ -24,7 +24,7 @@
     version="1.1">
 
   <portal-name>pluto-portal-driver</portal-name>
-  <portal-version>1.1.0-dev</portal-version>
+  <portal-version>1.1.0-SNAPSHOT</portal-version>
   <container-name>Pluto Portal Driver</container-name>
 
   <supports>

Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml?rev=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml Wed Aug 23 19:18:29 2006
@@ -23,8 +23,8 @@
 <web-app>
   
   <display-name>Apache Pluto Portal Driver</display-name>
-  
-  <listener>
+
+   <listener>
     <listener-class>org.apache.pluto.driver.PortalStartupListener</listener-class>
   </listener>
   

Modified: portals/pluto/trunk/pluto-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/pom.xml?rev=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site/pom.xml (original)
+++ portals/pluto/trunk/pluto-site/pom.xml Wed Aug 23 19:18:29 2006
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>pluto</artifactId>
     <groupId>org.apache.pluto</groupId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Wed Aug 23 19:18:29 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Wed Aug 23 19:18:29 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pluto</groupId>
     <artifactId>pluto</artifactId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&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 Wed Aug 23 19:18:29 2006
@@ -24,11 +24,11 @@
 
 # The value we expect to return from renderRequest.getPortalContext().getPortalInfo();
 
-expected.serverInfo = Pluto/1.1.0-dev
+expected.serverInfo = Pluto/1.1.0-SNAPSHOT
 expected.version.major=1
 expected.version.minor=0
 
-expected.portalInfo = pluto-portal-driver/1.1.0-dev
+expected.portalInfo = pluto-portal-driver/1.1.0-SNAPSHOT
 
 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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Wed Aug 23 19:18:29 2006
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>pluto</artifactId>
     <groupId>org.apache.pluto</groupId>
-    <version>1.1.0-dev</version>
+    <version>1.1.0-SNAPSHOT</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=434290&r1=434289&r2=434290&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Wed Aug 23 19:18:29 2006
@@ -32,7 +32,7 @@
    * 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>
+  <version>1.1.0-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>