Set version to M2.1 for all, it's release time

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@643613 13f79535-47bb-0310-9956-ffa450edef68

20 files changed, 41 insertions, 41 deletions

diff --git a/cpp/configure.ac b/cpp/configure.ac
index 2e7ea22607..36fe86d989 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -8,7 +8,7 @@ dnl This program is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([qpidc], [0.1], [qpid-dev@incubator.apache.org])
+AC_INIT([qpidc], [M2.1], [qpid-dev@incubator.apache.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
diff --git a/java/broker/distribution/pom.xml b/java/broker/distribution/pom.xml
index 15bd83f1a3..66f36b8dc9 100644
--- a/java/broker/distribution/pom.xml
+++ b/java/broker/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Broker Distributions</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-RC1</version>
+        <version>1.0-incubating-M2.1</version>
     </parent>
 
     <properties>
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index 3ac822a79e..7cdcb499fa 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -22,14 +22,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Broker</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/client-java14/pom.xml b/java/client-java14/pom.xml
index 9aa4ee3b92..ffb705a1e4 100644
--- a/java/client-java14/pom.xml
+++ b/java/client-java14/pom.xml
@@ -24,14 +24,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-client-java14</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Client for Java 1.4</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/client/distribution/pom.xml b/java/client/distribution/pom.xml
index d92935a351..c8c81caa99 100644
--- a/java/client/distribution/pom.xml
+++ b/java/client/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-client-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Client Distributions</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-RC1</version>
+        <version>1.0-incubating-M2.1</version>
     </parent>
 
     <properties>
diff --git a/java/client/example/pom.xml b/java/client/example/pom.xml
index b6eed8d880..2e59cb1b08 100644
--- a/java/client/example/pom.xml
+++ b/java/client/example/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-example</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Example</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/client/pom.xml b/java/client/pom.xml
index 4a84b8fce8..01e4fd0ac9 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-client</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Client</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 410def5a87..3140360b01 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-common</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Common Utilities</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/distribution/pom.xml b/java/distribution/pom.xml
index 3397dd52d2..250d57c909 100644
--- a/java/distribution/pom.xml
+++ b/java/distribution/pom.xml
@@ -25,12 +25,12 @@
     <artifactId>qpid-distribution</artifactId>
     <packaging>jar</packaging>
     <name>Qpid Distribution</name>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/integrationtests/pom.xml b/java/integrationtests/pom.xml
index 0932ba8257..13b08384d4 100644
--- a/java/integrationtests/pom.xml
+++ b/java/integrationtests/pom.xml
@@ -24,13 +24,13 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-integrationtests</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Integration Tests</name>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/junit-toolkit-maven-plugin/pom.xml b/java/junit-toolkit-maven-plugin/pom.xml
index 0076de8961..37c8008f70 100644
--- a/java/junit-toolkit-maven-plugin/pom.xml
+++ b/java/junit-toolkit-maven-plugin/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>

     <artifactId>junit-toolkit-maven-plugin</artifactId>

     <name>junit-toolkit-maven-plugin</name>

-    <version>1.0-incubating-M2.1-RC1</version>

+    <version>1.0-incubating-M2.1</version>

 

     <packaging>maven-plugin</packaging>

 

     <parent>

         <groupId>org.apache.qpid</groupId>

         <artifactId>qpid</artifactId>

-        <version>1.0-incubating-M2.1-RC1</version>

+        <version>1.0-incubating-M2.1</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

 

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

             <groupId>org.apache.qpid</groupId>

             <artifactId>junit-toolkit</artifactId>

-            <version>1.0-incubating-M2.1-RC1</version>

+            <version>1.0-incubating-M2.1</version>

         </dependency>

 

         <dependency>

diff --git a/java/junit-toolkit/pom.xml b/java/junit-toolkit/pom.xml
index 36dad3da8d..ace4231f6d 100644
--- a/java/junit-toolkit/pom.xml
+++ b/java/junit-toolkit/pom.xml
@@ -22,14 +22,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>junit-toolkit</artifactId>
     <name>junit-toolkit</name>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
 
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/management/eclipse-plugin/pom.xml b/java/management/eclipse-plugin/pom.xml
index 70527a9a6a..25f5a7b15a 100644
--- a/java/management/eclipse-plugin/pom.xml
+++ b/java/management/eclipse-plugin/pom.xml
@@ -23,13 +23,13 @@
     <groupId>org.apache.qpid.management</groupId>
     <artifactId>org.apache.qpid.management.ui</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Management</name>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/perftests/distribution/pom.xml b/java/perftests/distribution/pom.xml
index 4ba67b76f7..e9a8594862 100644
--- a/java/perftests/distribution/pom.xml
+++ b/java/perftests/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-perftests-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Performance Tests Distribution</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-RC1</version>
+        <version>1.0-incubating-M2.1</version>
     </parent>
 
     <properties>
diff --git a/java/perftests/pom.xml b/java/perftests/pom.xml
index 923c14ec5f..53df6fbf2e 100644
--- a/java/perftests/pom.xml
+++ b/java/perftests/pom.xml
@@ -24,14 +24,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-perftests</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid Performance Tests</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/plugins/pom.xml b/java/plugins/pom.xml
index 65064ce5d9..78261ee5e5 100644
--- a/java/plugins/pom.xml
+++ b/java/plugins/pom.xml
@@ -37,7 +37,7 @@
 	<description>A simple plugin for qpid.</description>
 	<groupId>org.apache.qpid.extras</groupId>
 	<artifactId>example-plugin</artifactId>
-	<version>1.0-incubating-M2.1-RC1</version>
+	<version>1.0-incubating-M2.1</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
@@ -47,12 +47,12 @@
 		<dependency>
 			<groupId>org.apache.qpid</groupId>
 			<artifactId>qpid-broker</artifactId>
-			<version>1.0-incubating-M2.1-RC1</version>
+			<version>1.0-incubating-M2.1</version>
 		</dependency>
                 <dependency>
                   <groupId>org.apache.qpid</groupId>
                   <artifactId>junit-toolkit</artifactId>
-                  <version>1.0-incubating-M2.1-RC1</version>
+                  <version>1.0-incubating-M2.1</version>
                 </dependency>
 
 	</dependencies>
diff --git a/java/pom.xml b/java/pom.xml
index 526b6889da..bf08119b3f 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,7 +24,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid</artifactId>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
diff --git a/java/skimtests/pom.xml b/java/skimtests/pom.xml
index 38bdb1a08a..797ad1e14a 100644
--- a/java/skimtests/pom.xml
+++ b/java/skimtests/pom.xml
@@ -24,14 +24,14 @@
     <groupId>org.apache.qpid</groupId>

     <artifactId>qpid-skimtests</artifactId>

     <packaging>jar</packaging>

-    <version>1.0-incubating-M2.1-RC1</version>

+    <version>1.0-incubating-M2.1</version>

     <name>Qpid Skim Tests</name>

     <url>http://cwiki.apache.org/confluence/display/qpid</url>

 

     <parent>

         <groupId>org.apache.qpid</groupId>

         <artifactId>qpid</artifactId>

-        <version>1.0-incubating-M2.1-RC1</version>

+        <version>1.0-incubating-M2.1</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

 

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

             <groupId>org.apache.qpid</groupId>

             <artifactId>qpid-broker</artifactId>

-            <version>1.0-incubating-M2.1-RC1</version>

+            <version>1.0-incubating-M2.1</version>

             <classifier>tests</classifier>

             <scope>test</scope>

         </dependency>

diff --git a/java/systests/distribution/pom.xml b/java/systests/distribution/pom.xml
index 47d694318e..17c0d0d033 100644
--- a/java/systests/distribution/pom.xml
+++ b/java/systests/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid System Tests Distribution</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index ae27eafd25..6e5d784266 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -22,14 +22,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-RC1</version>
+    <version>1.0-incubating-M2.1</version>
     <name>Qpid System Tests</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-RC1</version>
+        <version>1.0-incubating-M2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>