Merging trunk into the branch from r1189798-1199347 in preparation to reintegration


git-svn-id: https://svn.apache.org/repos/asf/aries/branches/oct-2011-release@1199354 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/blueprint/blueprint-annotation-api/pom.xml b/blueprint/blueprint-annotation-api/pom.xml
index dc34868..39cc4e8 100644
--- a/blueprint/blueprint-annotation-api/pom.xml
+++ b/blueprint/blueprint-annotation-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
@@ -27,7 +27,7 @@
     <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Blueprint Annotation API</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.2</version>
     <description>
         This bundle contains the blueprint annotation api and the corresponding xml schema.
     </description>
diff --git a/blueprint/blueprint-annotation-impl/pom.xml b/blueprint/blueprint-annotation-impl/pom.xml
index b10b8c8..5b310e7 100644
--- a/blueprint/blueprint-annotation-impl/pom.xml
+++ b/blueprint/blueprint-annotation-impl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.aries</groupId>
     <artifactId>java6-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5</version>
     <relativePath />
   </parent>
 
@@ -29,7 +29,7 @@
   <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Aries Blueprint Annotation Impl</name>
-  <version>0.3.2-SNAPSHOT</version>
+  <version>0.3.2</version>
   <description>
       This bundle contains an implementation of Blueprint annotation support 
   </description>
@@ -72,7 +72,7 @@
       <dependency>
           <groupId>org.apache.aries</groupId>
           <artifactId>org.apache.aries.util</artifactId>
-          <version>0.4-SNAPSHOT</version>
+          <version>0.4</version>
       </dependency>
       <dependency>
           <groupId>org.osgi</groupId>
diff --git a/blueprint/blueprint-annotation-itest/pom.xml b/blueprint/blueprint-annotation-itest/pom.xml
index 67b04b7..eb38347 100644
--- a/blueprint/blueprint-annotation-itest/pom.xml
+++ b/blueprint/blueprint-annotation-itest/pom.xml
@@ -21,23 +21,23 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.annotation.itests</artifactId>
     <name>Apache Aries Blueprint Annotation iTests</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.2</version>
     <description>
         Integration tests using the standalone blueprint-bundle for the implementation
         and blueprint-sample-annotation for the blueprint application to be tested.
     </description>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-annotation-itests</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-annotation-itests</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-itests</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-annotation-itest</url>
      </scm>
 
     <dependencies>
@@ -55,29 +55,29 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
-            <version>0.4-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
-            <version>0.4-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.2</version>
             <scope>test</scope>
         </dependency>        
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample-fragment</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.2</version>
             <scope>test</scope>
         </dependency>        
         <dependency>
@@ -144,12 +144,12 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.2</version>
         </dependency>
         <dependency>
           <groupId>org.apache.aries.testsupport</groupId>
           <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>0.4-SNAPSHOT</version>
+          <version>0.4</version>
           <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml
index e1849fb..461c719 100644
--- a/blueprint/blueprint-bundle/pom.xml
+++ b/blueprint/blueprint-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
@@ -27,16 +27,16 @@
     <artifactId>org.apache.aries.blueprint</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Blueprint Bundle</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.4</version>
     <description>
         This bundle contains the standalone implementation along with the API.
         It's composed of the blueprint-api, blueprint-core and blueprint-cm modules.
     </description>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-bundle</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-bundle</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-bundle</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-bundle</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-bundle</url>
      </scm>
 
     <properties>
@@ -100,10 +100,6 @@
         <aries.osgi.import.service>
             org.osgi.service.cm.ConfigurationAdmin;availability:=optional
         </aries.osgi.import.service>
-        <aries.osgi.include.resource>
-            {maven-resources},
-            META-INF/NOTICE=../NOTICE
-        </aries.osgi.include.resource>
         <aries.osgi.failok>
             true
         </aries.osgi.failok>
@@ -125,19 +121,19 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.cm</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
-            <version>0.4-SNAPSHOT</version>
+            <version>0.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -163,6 +159,11 @@
             <scope>provided</scope>
             <version>0.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml
index adca079..5eb3e36 100644
--- a/blueprint/blueprint-cm/pom.xml
+++ b/blueprint/blueprint-cm/pom.xml
@@ -21,23 +21,23 @@
  <parent>
     <groupId>org.apache.aries</groupId>
      <artifactId>java5-parent</artifactId>
-     <version>0.5-SNAPSHOT</version>
+     <version>0.5</version>
      <relativePath />
   </parent>
 
   <groupId>org.apache.aries.blueprint</groupId>
   <artifactId>org.apache.aries.blueprint.cm</artifactId>
   <packaging>bundle</packaging>
-  <version>0.3.2-SNAPSHOT</version>
+  <version>0.3.2</version>
   <name>Apache Aries Blueprint CM</name>
   <description>
       This bundle contains the ConfigAdmin namespace for blueprint.
   </description>
   
   <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-cm</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-cm</developerConnection>
-       <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-cm</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-cm</developerConnection>
+       <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-cm</url>
    </scm>
 
     <properties>
@@ -46,7 +46,11 @@
             *
         </aries.osgi.import>
     <!-- Export package versions are maintained in packageinfo files -->
-         <aries.osgi.export.pkg/>
+         <aries.osgi.export.pkg />
+         <aries.osgi.import.pkg>
+             org.apache.aries.*;version="$&lt;range;[==,=+)&gt;",
+             *
+         </aries.osgi.import.pkg>
          <aries.osgi.private.pkg>
              org.apache.aries.blueprint.compendium.cm
          </aries.osgi.private.pkg>
@@ -61,7 +65,7 @@
       <dependency>
           <groupId>org.apache.aries.blueprint</groupId>
           <artifactId>org.apache.aries.blueprint.core</artifactId>
-          <version>0.3.2-SNAPSHOT</version>
+          <version>0.4</version>
       </dependency>
       <dependency>
           <groupId>org.osgi</groupId>
diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml
index b8851a4..924662d 100644
--- a/blueprint/blueprint-core/pom.xml
+++ b/blueprint/blueprint-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
         <relativePath />
   </parent>
 
@@ -29,16 +29,16 @@
   <artifactId>org.apache.aries.blueprint.core</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Aries Blueprint Core</name>
-  <version>0.3.2-SNAPSHOT</version>
+  <version>0.4</version>
   <description>
       This bundle contains the core implementation of Blueprint 
       along with the "ext" namespace handler.
   </description>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-core</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-core</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-core</url>
      </scm>
   <properties>
       <aries.osgi.activator>
@@ -85,6 +85,10 @@
       <aries.osgi.export.service>
           org.apache.aries.blueprint.ParserService
       </aries.osgi.export.service>
+      <aries.osgi.include.resource>
+          {maven-resources},
+          org/apache/aries/blueprint/blueprint.xsd=${project.build.directory}/sources/org/osgi/service/blueprint/blueprint.xsd
+      </aries.osgi.include.resource>
   </properties>
   
   <dependencies>
@@ -102,13 +106,13 @@
       <dependency>
           <groupId>org.apache.aries.blueprint</groupId>
           <artifactId>blueprint-parser</artifactId>
-          <version>0.4-SNAPSHOT</version>
+          <version>0.4</version>
           <scope>provided</scope>
       </dependency>
       <dependency>
           <groupId>org.apache.aries</groupId>
           <artifactId>org.apache.aries.util</artifactId>
-          <version>0.4-SNAPSHOT</version>
+          <version>0.4</version>
       </dependency>
       <dependency>
           <groupId>org.osgi</groupId>
@@ -155,7 +159,7 @@
       <dependency>
           <groupId>org.apache.aries.proxy</groupId>
           <artifactId>org.apache.aries.proxy.api</artifactId>
-          <version>0.4-SNAPSHOT</version>
+          <version>0.4</version>
       </dependency>
       <dependency>
           <groupId>junit</groupId>
@@ -171,19 +175,37 @@
                 <directory>src/main/resources</directory>
             </resource>
             <resource>
-                <directory>../blueprint-api/src/main/resources/org/osgi/service/blueprint</directory>
-                <targetPath>org/apache/aries/blueprint</targetPath>
-                <includes>
-                    <include>blueprint.xsd</include>
-                </includes>
-            </resource>
-            <resource>
                   <directory>${project.build.sourceDirectory}</directory>
                   <includes>
                      <include>**/packageinfo</include>
                   </includes>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.blueprint</groupId>
+                                    <artifactId>org.apache.aries.blueprint.api</artifactId>
+                                    <classifier>sources</classifier>
+                                    <includes>**/blueprint.xsd</includes>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/sources</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
-  
 </project>
diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
index 16aa16d..bc619db 100644
--- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
+++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
@@ -1,3 +1,19 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
 package org.apache.aries.blueprint.ext.evaluator;
 
 import java.util.Dictionary;
diff --git a/blueprint/blueprint-distro/pom.xml b/blueprint/blueprint-distro/pom.xml
index dc53998..9a569e1 100644
--- a/blueprint/blueprint-distro/pom.xml
+++ b/blueprint/blueprint-distro/pom.xml
@@ -21,15 +21,15 @@
     <parent>
        <groupId>org.apache.aries</groupId>
        <artifactId>java5-parent</artifactId>
-       <version>0.4</version>
+       <version>0.5</version>
        <relativePath />
     </parent>
 
 
 	<groupId>org.apache.aries.blueprint</groupId>
-	<artifactId>org.apache.aries.blueprint-distro</artifactId>
+	<artifactId>blueprint-distro</artifactId>
 	<name>Blueprint distribution</name>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.4-SNAPSHOT</version>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-distro</connection>
@@ -42,12 +42,12 @@
        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
-            <version>0.3</version>
+            <version>0.3.2</version>
         </dependency>
        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
-            <version>0.3</version>
+            <version>0.3.2</version>
         </dependency>
        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
@@ -57,13 +57,18 @@
        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.cm</artifactId>
-            <version>0.3</version>
+            <version>0.3.2</version>
         </dependency>
        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>0.3</version>
-        </dependency>
+            <version>0.4</version>
+       </dependency>
+       <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
+            <version>0.1.0</version>
+       </dependency>
     </dependencies>
 
     <build>
diff --git a/blueprint/blueprint-itests/pom.xml b/blueprint/blueprint-itests/pom.xml
index 8a59d4c..69bd76f 100644
--- a/blueprint/blueprint-itests/pom.xml
+++ b/blueprint/blueprint-itests/pom.xml
@@ -21,23 +21,23 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.itests</artifactId>
     <name>Apache Aries Blueprint iTests</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.4</version>
     <description>
         Integration tests using the standalone blueprint-bundle for the implementation
         and blueprint-sample for the blueprint application to be tested.
     </description>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-itests</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-itests</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-itests</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-itests</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-itests</url>
      </scm>
 
     <dependencies>
@@ -60,43 +60,43 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
             <scope>test</scope>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>0.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
-            <version>0.4-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample</artifactId>
             <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
             <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
             <scope>test</scope>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
-            <version>0.4-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
@@ -167,7 +167,7 @@
         <dependency>
            <groupId>org.apache.aries.proxy</groupId>
            <artifactId>org.apache.aries.proxy</artifactId>
-           <version>0.4-SNAPSHOT</version>
+           <version>0.4</version>
      	</dependency>
         <dependency>
         	<groupId>org.apache.aries.quiesce</groupId>
@@ -179,21 +179,21 @@
         <dependency>
         	<groupId>org.apache.aries.blueprint</groupId>
         	<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
-        	<version>0.3.2-SNAPSHOT</version>
+        	<version>0.3.2</version>
         	<type>bundle</type>
         	<scope>compile</scope>
         </dependency>
         <dependency>
         	<groupId>org.apache.aries.blueprint</groupId>
         	<artifactId>org.apache.aries.blueprint.core</artifactId>
-        	<version>0.3.2-SNAPSHOT</version>
+        	<version>0.4</version>
         	<type>bundle</type>
         	<scope>compile</scope>
         </dependency>
         <dependency>
         	<groupId>org.apache.aries.blueprint</groupId>
         	<artifactId>org.apache.aries.blueprint.cm</artifactId>
-        	<version>0.3.2-SNAPSHOT</version>
+        	<version>0.3.2</version>
         	<type>bundle</type>
         	<scope>compile</scope>
         </dependency>
diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml
index b14d4d5..9f802c1 100644
--- a/blueprint/blueprint-jexl-evaluator/pom.xml
+++ b/blueprint/blueprint-jexl-evaluator/pom.xml
@@ -21,7 +21,7 @@
   <parent>

         <groupId>org.apache.aries</groupId>

         <artifactId>java5-parent</artifactId>

-        <version>0.5-SNAPSHOT</version>

+        <version>0.5</version>

         <relativePath />

   </parent>

 

@@ -29,20 +29,20 @@
   <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>

   <packaging>bundle</packaging>

   <name>Apache Aries Blueprint JEXL evaluator</name>

-  <version>0.1.0-SNAPSHOT</version>

+  <version>0.1.0</version>

   <description>

       This bundle contains a plugin to the "ext" namespace handler for evaluating expressions using JEXL

   </description>

 

      <scm>

-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</connection>

-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</developerConnection>

-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator</url>

+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator</connection>

+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator</developerConnection>

+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-jexl-evaluator</url>

      </scm>

   <properties>

       

       <!-- Export package versions are maintained in packageinfo files -->

-      <aries.osgi.export.pkg/>

+      <aries.osgi.export.pkg />

       <!-- 

           We use the range macro to get a 0.x to 0.x+1 version range while Aries is still

           stabilizing API. This should be removed once the dependency is available at a 

@@ -63,7 +63,7 @@
       <dependency>

           <groupId>org.apache.aries.blueprint</groupId>

           <artifactId>org.apache.aries.blueprint.core</artifactId>

-          <version>0.3.2-SNAPSHOT</version>

+          <version>0.4</version>

       </dependency>

       <dependency>

           <groupId>org.apache.commons</groupId>

diff --git a/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml
index 68fd04c..83a8967 100644
--- a/blueprint/blueprint-parser/pom.xml
+++ b/blueprint/blueprint-parser/pom.xml
@@ -21,7 +21,7 @@
   <parent>

         <groupId>org.apache.aries</groupId>

         <artifactId>java5-parent</artifactId>

-        <version>0.5-SNAPSHOT</version>

+        <version>0.5</version>

         <relativePath />

   </parent>

 

@@ -29,7 +29,7 @@
   <artifactId>blueprint-parser</artifactId>

   <packaging>jar</packaging>

   <name>Apache Aries Blueprint Parser</name>

-  <version>0.4-SNAPSHOT</version>

+  <version>0.4</version>

   <description>

       This bundle contains the blueprint parser in a plain jar.

   </description>

diff --git a/blueprint/blueprint-sample-annotation/pom.xml b/blueprint/blueprint-sample-annotation/pom.xml
index c8ef707..19139e1 100644
--- a/blueprint/blueprint-sample-annotation/pom.xml
+++ b/blueprint/blueprint-sample-annotation/pom.xml
@@ -19,23 +19,23 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
     <name>Apache Aries Blueprint Sample for Testing Annotation</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.2</version>
     <packaging>bundle</packaging>
     <description>
         Example blueprint application, mostly used for annotation tests.
     </description>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-annotation</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-annotation</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-annotation</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-sample-annotation</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-sample-annotation</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-sample-annotation</url>
      </scm>
 
     <properties>
diff --git a/blueprint/blueprint-sample-fragment/pom.xml b/blueprint/blueprint-sample-fragment/pom.xml
index 018743f..db30ba5 100644
--- a/blueprint/blueprint-sample-fragment/pom.xml
+++ b/blueprint/blueprint-sample-fragment/pom.xml
@@ -19,23 +19,23 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.sample-fragment</artifactId>
     <name>Apache Aries Blueprint Sample Fragment for Testing Annotation</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.2</version>
     <packaging>bundle</packaging>
     <description>
-        Example blueprint application, mostly used for annotation tests.
+        Example blueprint fragment, mostly used for annotation tests.
     </description>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-annotation</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-annotation</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-annotation</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-sample-fragment</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-sample-fragment</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-sample-fragment</url>
      </scm>
 
     <properties>
diff --git a/blueprint/blueprint-sample/pom.xml b/blueprint/blueprint-sample/pom.xml
index f46fda1..0f8660b 100644
--- a/blueprint/blueprint-sample/pom.xml
+++ b/blueprint/blueprint-sample/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
@@ -27,15 +27,15 @@
     <artifactId>org.apache.aries.blueprint.sample</artifactId>
     <name>Apache Aries Blueprint Sample</name>
     <packaging>bundle</packaging>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.4</version>
     <description>
         Example blueprint application, mostly used for integration tests.
     </description>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-sample</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-sample</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-sample</url>
      </scm>
 
     <properties>
@@ -46,7 +46,7 @@
             org.apache.aries.blueprint.sample.Activator
         </aries.osgi.activator>
         <aries.osgi.private.pkg />
-        <aries.osgi.import.pkg > *
+        <aries.osgi.import.pkg> *
         </aries.osgi.import.pkg>
     </properties>
 
diff --git a/blueprint/blueprint-testbundlea/pom.xml b/blueprint/blueprint-testbundlea/pom.xml
index 26cad81..67231aa 100644
--- a/blueprint/blueprint-testbundlea/pom.xml
+++ b/blueprint/blueprint-testbundlea/pom.xml
@@ -20,20 +20,20 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
     <name>Apache Aries Blueprint Test Bundle A</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.2</version>
     <packaging>bundle</packaging>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundlea</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundlea</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/testbundlea</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-testbundlea</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-testbundlea</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-testbundlea</url>
      </scm>
 
     <properties>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
     </dependencies>
 
diff --git a/blueprint/blueprint-testbundleb/pom.xml b/blueprint/blueprint-testbundleb/pom.xml
index 4bff6e1..f817847 100644
--- a/blueprint/blueprint-testbundleb/pom.xml
+++ b/blueprint/blueprint-testbundleb/pom.xml
@@ -20,20 +20,20 @@
     <parent>
     <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
     <name>Apache Aries Blueprint Test Bundle B</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.2</version>
     <packaging>bundle</packaging>
 
      <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundleb</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundleb</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/testbundleb</url>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-testbundleb</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-testbundleb</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-testbundleb</url>
      </scm>
 
     <properties>
@@ -58,12 +58,12 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>0.4</version>
         </dependency>
     </dependencies>
 
diff --git a/blueprint/blueprint-testquiescebundle/pom.xml b/blueprint/blueprint-testquiescebundle/pom.xml
index 140555b..70d99d7 100644
--- a/blueprint/blueprint-testquiescebundle/pom.xml
+++ b/blueprint/blueprint-testquiescebundle/pom.xml
@@ -1,66 +1,66 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description>
-    <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
-    </parent>
-
-    <groupId>org.apache.aries.blueprint</groupId>
-    <artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
-    <name>Apache Aries Blueprint Test Quiesce Bundle</name>
-    <packaging>bundle</packaging>
-    <version>0.3.2-SNAPSHOT</version>
-
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/testquiescebundle</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/testquiescebundle</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/testquiescebundle</url>
-     </scm>
-    <properties>
-        <aries.osgi.activator>
-            org.apache.aries.blueprint.testquiescebundle.Activator
-        </aries.osgi.activator>
-        <aries.osgi.private.pkg />
-        <aries.osgi.import.pkg> *
-        </aries.osgi.import.pkg>
-        <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-</project>
+<!--

+    Licensed to the Apache Software Foundation (ASF) under one or more

+    contributor license agreements.  See the NOTICE file distributed with

+    this work for additional information regarding copyright ownership.

+    The ASF licenses this file to You 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description>

+    <parent>

+        <groupId>org.apache.aries</groupId>

+        <artifactId>java5-parent</artifactId>

+        <version>0.5</version>

+        <relativePath />

+    </parent>

+

+    <groupId>org.apache.aries.blueprint</groupId>

+    <artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>

+    <name>Apache Aries Blueprint Test Quiesce Bundle</name>

+    <packaging>bundle</packaging>

+    <version>0.3.2</version>

+

+     <scm>

+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-testquiescebundle</connection>

+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/blueprint/blueprint-testquiescebundle</developerConnection>

+         <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-testquiescebundle</url>

+     </scm>

+    <properties>

+        <aries.osgi.activator>

+            org.apache.aries.blueprint.testquiescebundle.Activator

+        </aries.osgi.activator>

+        <aries.osgi.private.pkg />

+        <aries.osgi.import.pkg> *

+        </aries.osgi.import.pkg>

+        <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>

+    </properties>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.eclipse</groupId>

+            <artifactId>osgi</artifactId>

+            <scope>provided</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.aries.blueprint</groupId>

+            <artifactId>org.apache.aries.blueprint.api</artifactId>

+            <version>0.3</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.aries.blueprint</groupId>

+            <artifactId>org.apache.aries.blueprint.core</artifactId>

+            <version>0.4</version>

+        </dependency>

+    </dependencies>

+

+</project>

diff --git a/parent/default-parent/java5-parent/pom.xml b/parent/default-parent/java5-parent/pom.xml
index 3df16fa..af061e5 100644
--- a/parent/default-parent/java5-parent/pom.xml
+++ b/parent/default-parent/java5-parent/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>default-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>
     
     <artifactId>java5-parent</artifactId>
diff --git a/parent/default-parent/java6-parent/pom.xml b/parent/default-parent/java6-parent/pom.xml
index 4ac1c5e..2869e18 100644
--- a/parent/default-parent/java6-parent/pom.xml
+++ b/parent/default-parent/java6-parent/pom.xml
@@ -25,7 +25,7 @@
     <parent>

         <groupId>org.apache.aries</groupId>

         <artifactId>default-parent</artifactId>

-        <version>0.5-SNAPSHOT</version>

+        <version>0.5</version>

     </parent>

     

     <artifactId>java6-parent</artifactId>

diff --git a/parent/default-parent/pom.xml b/parent/default-parent/pom.xml
index 52aaf21..6f53ba5 100644
--- a/parent/default-parent/pom.xml
+++ b/parent/default-parent/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>default-parent</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 2f53473..097ca82 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -32,7 +32,7 @@
     <groupId>org.apache.aries</groupId>
     <artifactId>parent</artifactId>
     <name>Aries :: Top Parent POM</name>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5</version>
     <packaging>pom</packaging>
 
     <description>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index b4a86d1..967731f 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>  
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/proxy/proxy-api/pom.xml b/proxy/proxy-api/pom.xml
index a836774..c1d191d 100644
--- a/proxy/proxy-api/pom.xml
+++ b/proxy/proxy-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>

     <groupId>org.apache.aries</groupId>

         <artifactId>java5-parent</artifactId>

-        <version>0.5-SNAPSHOT</version>

+        <version>0.5</version>

         <relativePath />

     </parent>

 

@@ -29,7 +29,7 @@
     <artifactId>org.apache.aries.proxy.api</artifactId>

     <packaging>bundle</packaging>

     <name>Apache Aries Proxy API</name>

-    <version>0.4-SNAPSHOT</version>

+    <version>0.4</version>

     <description>

         This bundle contains the Apache Aries Proxy service API.

     </description>

@@ -69,7 +69,7 @@
         <dependency>

             <groupId>org.apache.aries</groupId>

             <artifactId>org.apache.aries.util</artifactId>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

         </dependency>

     </dependencies>

 </project>

diff --git a/proxy/proxy-bundle/pom.xml b/proxy/proxy-bundle/pom.xml
index bd6de97..8ec229b 100644
--- a/proxy/proxy-bundle/pom.xml
+++ b/proxy/proxy-bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>

           <groupId>org.apache.aries</groupId>

           <artifactId>java5-parent</artifactId>

-          <version>0.5-SNAPSHOT</version>

+          <version>0.5</version>

           <relativePath />

     </parent>

 

@@ -29,15 +29,15 @@
     <artifactId>org.apache.aries.proxy</artifactId>

     <packaging>bundle</packaging>

     <name>Apache Aries Proxy Bundle</name>

-    <version>0.4-SNAPSHOT</version>

+    <version>0.4</version>

     <description>

         This bundle contains the Apache Aries Proxy Service.

     </description>

 

     <scm>

-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-bundle</connection>

-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-bundle</developerConnection>

-        <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle</url>

+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/branches/oct-2011-release/proxy/proxy-bundle</connection>

+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/branches/oct-2011-release/proxy/proxy-bundle</developerConnection>

+        <url>http://svn.apache.org/viewvc/aries/branches/oct-2011-release/proxy/proxy-bundle</url>

     </scm>

 

 

@@ -68,13 +68,13 @@
         <dependency>

         	<groupId>org.apache.aries.proxy</groupId>

         	<artifactId>org.apache.aries.proxy.api</artifactId>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

             <scope>provided</scope>

         </dependency>

         <dependency>

         	<groupId>org.apache.aries.proxy</groupId>

         	<artifactId>org.apache.aries.proxy.impl</artifactId>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

             <scope>provided</scope>

         </dependency>

         <dependency>

diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index 226bbd9..7014dec 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>

          <groupId>org.apache.aries</groupId>

          <artifactId>java5-parent</artifactId>

-         <version>0.5-SNAPSHOT</version>

+         <version>0.5</version>

          <relativePath />

     </parent>

 

@@ -29,7 +29,7 @@
     <artifactId>org.apache.aries.proxy.impl</artifactId>

     <packaging>bundle</packaging>

     <name>Apache Aries Proxy Service</name>

-    <version>0.4-SNAPSHOT</version>

+    <version>0.4</version>

     <description>

         This bundle contains the proxy service implementation for Apache Aries

     </description>

@@ -101,13 +101,13 @@
         <dependency>

             <groupId>org.apache.aries.testsupport</groupId>

             <artifactId>org.apache.aries.testsupport.unit</artifactId>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

             <scope>test</scope>

         </dependency>

         <dependency>

         	<groupId>org.apache.aries.proxy</groupId>

         	<artifactId>org.apache.aries.proxy.api</artifactId>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

         </dependency>

     </dependencies>

 

diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml
index bed5227..55065ce 100644
--- a/proxy/proxy-itests/pom.xml
+++ b/proxy/proxy-itests/pom.xml
@@ -21,13 +21,13 @@
     <parent>

        <groupId>org.apache.aries</groupId>

        <artifactId>java5-parent</artifactId>

-       <version>0.5-SNAPSHOT</version>

+       <version>0.5</version>

        <relativePath />

     </parent>

 

     <groupId>org.apache.aries.proxy</groupId>

     <artifactId>org.apache.aries.proxy.itests</artifactId>

-    <version>0.4-SNAPSHOT</version>

+    <version>0.4</version>

     

     <name>Apache Aries Proxy iTests</name>

     <description>

@@ -66,18 +66,18 @@
             <groupId>org.apache.aries.proxy</groupId>

             <artifactId>org.apache.aries.proxy</artifactId>

             <scope>test</scope>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

         </dependency>

         <dependency>

             <groupId>org.apache.aries</groupId>

             <artifactId>org.apache.aries.util</artifactId>

             <scope>test</scope>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

         </dependency>

         <dependency>

           <groupId>org.apache.aries.testsupport</groupId>

           <artifactId>org.apache.aries.testsupport.unit</artifactId>

-          <version>0.4-SNAPSHOT</version>

+          <version>0.4</version>

           <scope>test</scope>

         </dependency>

         <dependency>

diff --git a/quiesce/quiesce-api/pom.xml b/quiesce/quiesce-api/pom.xml
index 2c3d3c8..a91fc66 100644
--- a/quiesce/quiesce-api/pom.xml
+++ b/quiesce/quiesce-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>

           <groupId>org.apache.aries</groupId>

           <artifactId>java5-parent</artifactId>

-          <version>0.5-SNAPSHOT</version>

+          <version>0.5-SNAPSHOt</version>

           <relativePath />

 

     </parent>

diff --git a/quiesce/quiesce-manager-itest/pom.xml b/quiesce/quiesce-manager-itest/pom.xml
index 5445600..1841b87 100644
--- a/quiesce/quiesce-manager-itest/pom.xml
+++ b/quiesce/quiesce-manager-itest/pom.xml
@@ -21,14 +21,14 @@
     <parent>

      <groupId>org.apache.aries</groupId>

      <artifactId>java5-parent</artifactId>

-     <version>0.5-SNAPSHOT</version>

+     <version>0.5</version>

      <relativePath />

     </parent>

 

     <modelVersion>4.0.0</modelVersion>

     <groupId>org.apache.aries.quiesce</groupId>

     <artifactId>org.apache.aries.quiesce.manager.itest</artifactId>

-    <version>0.3.1-SNAPSHOT</version>

+    <version>0.3.1</version>

     <name>Aries Quiesce Manager iTests</name>

 

     <scm>

@@ -47,13 +47,13 @@
         <dependency>

             <groupId>org.apache.aries.quiesce</groupId>

             <artifactId>org.apache.aries.quiesce.manager</artifactId>

-            <version>0.3.1-SNAPSHOT</version>

+            <version>0.3.1</version>

             <scope>provided</scope>

         </dependency>

         <dependency>

           <groupId>org.apache.aries.testsupport</groupId>

           <artifactId>org.apache.aries.testsupport.unit</artifactId>

-          <version>0.4-SNAPSHOT</version>

+          <version>0.4</version>

           <scope>test</scope>

         </dependency>

         <dependency>

@@ -100,7 +100,7 @@
             <groupId>org.apache.aries</groupId>

             <artifactId>org.apache.aries.util</artifactId>

             <scope>test</scope>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

         </dependency>

         <dependency>

                 <groupId>org.apache.felix</groupId>

diff --git a/quiesce/quiesce-manager/pom.xml b/quiesce/quiesce-manager/pom.xml
index 9a3e608..aca04db 100644
--- a/quiesce/quiesce-manager/pom.xml
+++ b/quiesce/quiesce-manager/pom.xml
@@ -21,14 +21,14 @@
     <parent>

     <groupId>org.apache.aries</groupId>

         <artifactId>java5-parent</artifactId>

-        <version>0.5-SNAPSHOT</version>

+        <version>0.5</version>

         <relativePath />

     </parent>

 

     <groupId>org.apache.aries.quiesce</groupId>

     <artifactId>org.apache.aries.quiesce.manager</artifactId>

     <packaging>bundle</packaging>

-    <version>0.3.1-SNAPSHOT</version>

+    <version>0.3.1</version>

     <name>Apache Aries Quiesce Manager</name>

     <description>

       Quiesce Manager.

@@ -77,7 +77,7 @@
         <dependency>

             <groupId>org.apache.aries</groupId>

             <artifactId>org.apache.aries.util</artifactId>

-            <version>0.4-SNAPSHOT</version>

+            <version>0.4</version>

         </dependency>

         <dependency>

             <groupId>org.osgi</groupId>

diff --git a/testsupport/pom.xml b/testsupport/pom.xml
index 26d1844..ee4423c 100644
--- a/testsupport/pom.xml
+++ b/testsupport/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
diff --git a/testsupport/testsupport-unit/pom.xml b/testsupport/testsupport-unit/pom.xml
index 109bd3d..53a5958 100644
--- a/testsupport/testsupport-unit/pom.xml
+++ b/testsupport/testsupport-unit/pom.xml
@@ -20,7 +20,7 @@
   <parent>
   <groupId>org.apache.aries</groupId>
        <artifactId>java5-parent</artifactId>
-       <version>0.5-SNAPSHOT</version>
+       <version>0.5</version>
        <relativePath />
   </parent>
 
@@ -28,7 +28,7 @@
   <artifactId>org.apache.aries.testsupport.unit</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Aries Unit Test Support</name>
-  <version>0.4-SNAPSHOT</version>
+  <version>0.4</version>
   <description>
       This bundle provides unit test support.
   </description>
diff --git a/util/pom.xml b/util/pom.xml
index b9c355c..99befd6 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.aries.util</artifactId>
     <packaging>bundle</packaging>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.4</version>
     <name>Apache Aries Util</name>
     <description>
         This bundle contains the OSGi common util for Apache Aries