From e17e5eca88a1111bffb5d3dc1613b926d71697f5 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Tue, 6 Feb 2007 19:09:51 +0000
Subject: [PATCH] Updated version to remove the "incubator" bit.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504248 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-console/pom.xml                      |  2 +-
 activemq-core/pom.xml                         |  7 +-
 activemq-jaas/pom.xml                         |  2 +-
 activemq-jpa-store/pom.xml                    |  2 +-
 activemq-openwire-generator/pom.xml           |  2 +-
 activemq-optional/pom.xml                     |  2 +-
 activemq-perftest/pom.xml                     |  2 +-
 activemq-ra/pom.xml                           |  2 +-
 activemq-rar/pom.xml                          |  2 +-
 activemq-repository-builder/pom.xml           |  2 +-
 activemq-systest/pom.xml                      |  2 +-
 activemq-test-atomikos/pom.xml                |  2 +-
 .../maven-activemq-memtest-plugin/pom.xml     |  2 +-
 .../maven-activemq-perf-plugin/pom.xml        |  2 +-
 .../maven-activemq-plugin/pom.xml             |  2 +-
 activemq-tooling/pom.xml                      |  2 +-
 activemq-web-console/pom.xml                  |  2 +-
 activemq-web-demo/pom.xml                     |  2 +-
 activemq-web/pom.xml                          |  2 +-
 activemq-xmpp/pom.xml                         |  2 +-
 assembly/pom.xml                              |  2 +-
 pom.xml                                       | 98 +++++++++----------
 22 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index f08a3dec5e..bbb8ff14be 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index aa1e96d267..5e2d2f30c1 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-core</artifactId>
@@ -147,6 +147,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-openwire-generator</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <!--  LDAP tests -->
     <dependency>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 7afc5a88d4..aa8defcc6f 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
diff --git a/activemq-jpa-store/pom.xml b/activemq-jpa-store/pom.xml
index 6bfa03a37e..7b31ae5f8f 100755
--- a/activemq-jpa-store/pom.xml
+++ b/activemq-jpa-store/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jpa-store</artifactId>
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
index 5cc4180240..15e22a490b 100644
--- a/activemq-openwire-generator/pom.xml
+++ b/activemq-openwire-generator/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index a6c382c342..060a2a131d 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-optional</artifactId>
diff --git a/activemq-perftest/pom.xml b/activemq-perftest/pom.xml
index ed8e44ecdf..4e4d4fd975 100644
--- a/activemq-perftest/pom.xml
+++ b/activemq-perftest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>activemq-parent</artifactId>
         <groupId>org.apache.activemq</groupId>
-        <version>4.2-incubator-SNAPSHOT</version>
+        <version>4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>activemq-perftest</artifactId>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 5bc0ab404b..e4bad0137a 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index d1f5840603..e4f5134178 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
diff --git a/activemq-repository-builder/pom.xml b/activemq-repository-builder/pom.xml
index 0e1429423c..5d364fae55 100644
--- a/activemq-repository-builder/pom.xml
+++ b/activemq-repository-builder/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
   
   <artifactId>activemq-repository-builder</artifactId>
diff --git a/activemq-systest/pom.xml b/activemq-systest/pom.xml
index fb95bf83fc..f9be92024b 100755
--- a/activemq-systest/pom.xml
+++ b/activemq-systest/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-systest</artifactId>
diff --git a/activemq-test-atomikos/pom.xml b/activemq-test-atomikos/pom.xml
index 4edab0fa50..276c7db1d9 100755
--- a/activemq-test-atomikos/pom.xml
+++ b/activemq-test-atomikos/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-test-atomikos</artifactId>
diff --git a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
index 05b90c6801..308931786b 100644
--- a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.2-incubator-SNAPSHOT</version>
+        <version>4.2-SNAPSHOT</version>
 	</parent>
     
 	<artifactId>maven-activemq-memtest-plugin</artifactId>
diff --git a/activemq-tooling/maven-activemq-perf-plugin/pom.xml b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
index 49d097ffa4..ffbb4b0843 100644
--- a/activemq-tooling/maven-activemq-perf-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.2-incubator-SNAPSHOT</version>
+        <version>4.2-SNAPSHOT</version>
 	</parent>
 
     <artifactId>maven-activemq-perf-plugin</artifactId>
diff --git a/activemq-tooling/maven-activemq-plugin/pom.xml b/activemq-tooling/maven-activemq-plugin/pom.xml
index d911aa9c2c..a1d8bcdac8 100644
--- a/activemq-tooling/maven-activemq-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.2-incubator-SNAPSHOT</version>
+        <version>4.2-SNAPSHOT</version>
 	</parent>
     
 	<artifactId>maven-activemq-plugin</artifactId>
diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
index c290c5dba4..6572530a95 100644
--- a/activemq-tooling/pom.xml
+++ b/activemq-tooling/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 223e943f02..fe36e4bee8 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index e02fa7844f..c63517ddc6 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 01eddd5ef9..927e7db7e6 100755
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>
diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
index ad97d5f7bb..cb42c83e75 100755
--- a/activemq-xmpp/pom.xml
+++ b/activemq-xmpp/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-xmpp</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 71cc767da7..886b26aa38 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.2-incubator-SNAPSHOT</version>
+    <version>4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
diff --git a/pom.xml b/pom.xml
index 2f629ead11..9e289d7bf3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -24,10 +24,56 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activemq-parent</artifactId>
-  <version>4.2-incubator-SNAPSHOT</version>
+  <version>4.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
 
+  <properties>
+    <activemq-version>4.2-SNAPSHOT</activemq-version>
+    <activesoap-version>1.3</activesoap-version>
+    <annogen-version>0.1.0</annogen-version>
+    <ant-version>1.6.2</ant-version>
+    <aopalliance-version>1.0</aopalliance-version>
+    <axion-version>1.0-M3-dev</axion-version>
+    <axis-version>1.2-RC1</axis-version>
+    <cglib-version>2.0</cglib-version>
+    <commons-beanutils-version>1.6.1</commons-beanutils-version>
+    <commons-collections-version>3.1</commons-collections-version>
+    <openjpa-version>0.9.6-incubating</openjpa-version>
+    <commons-dbcp-version>1.2.1</commons-dbcp-version>
+    <commons-httpclient-version>2.0.1</commons-httpclient-version>
+    <commons-logging-version>1.1</commons-logging-version>
+    <commons-pool-version>1.2</commons-pool-version>
+    <commons-primitives-version>1.0</commons-primitives-version>
+    <directory-asn1-version>0.3.2</directory-asn1-version>
+    <directory-kerboros-version>0.5</directory-kerboros-version>
+    <directory-mina-version>0.7.3</directory-mina-version>
+    <directory-version>0.9.2</directory-version>
+    <geronimo-version>1.0</geronimo-version>
+    <howl-version>0.1.8</howl-version>
+    <hsqldb-version>1.7.2.2</hsqldb-version>
+    <jdom-version>1.0</jdom-version>
+    <jetty-version>6.0.1</jetty-version>
+    <jmock-version>1.0.1</jmock-version>
+    <junit-version>3.8.1</junit-version>
+    <jxta-version>2.0</jxta-version>
+    <log4j-version>1.2.12</log4j-version>
+    <org-apache-derby-version>10.1.3.1</org-apache-derby-version>
+    <org-apache-geronimo-specs-version>1.0</org-apache-geronimo-specs-version>
+    <org-apache-maven-surefire-plugin-version>2.2</org-apache-maven-surefire-plugin-version>
+    <p2psockets-version>1.1.2</p2psockets-version>
+    <regexp-version>1.3</regexp-version>
+    <rome-version>0.8</rome-version>
+    <stax-version>1.1.1-dev</stax-version>
+    <xalan-version>2.6.0</xalan-version>
+    <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
+    <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
+    <xstream-version>1.1.2</xstream-version>
+    <xbean-version>2.8</xbean-version>
+    <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-incubating-repository</dist-repo-url>
+    <m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
+    <site-repo-url>scpexe://people.apache.org/www/incubator.apache.org/activemq/maven/</site-repo-url>
+  </properties>
   <prerequisites>
     <maven>2.0.4</maven>
   </prerequisites>
@@ -190,7 +236,7 @@
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-gbean-management</artifactId>
         <version>${activemq-version}</version>
-  	  </dependency>
+      </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-console</artifactId>
@@ -229,7 +275,7 @@
         <version>3.1-incubator-SNAPSHOT</version>
         <type>test-jar</type>
       </dependency>
-	  <dependency>
+      <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-openwire-generator</artifactId>
         <version>${activemq-version}</version>
@@ -879,50 +925,4 @@
     </plugins>
   </reporting>
 
-  <properties>
-    <activemq-version>4.2-incubator-SNAPSHOT</activemq-version>
-    <activesoap-version>1.3</activesoap-version>
-    <annogen-version>0.1.0</annogen-version>
-    <ant-version>1.6.2</ant-version>
-    <aopalliance-version>1.0</aopalliance-version>
-    <axion-version>1.0-M3-dev</axion-version>
-    <axis-version>1.2-RC1</axis-version>
-    <cglib-version>2.0</cglib-version>
-    <commons-beanutils-version>1.6.1</commons-beanutils-version>
-    <commons-collections-version>3.1</commons-collections-version>
-    <openjpa-version>0.9.6-incubating</openjpa-version>
-    <commons-dbcp-version>1.2.1</commons-dbcp-version>
-    <commons-httpclient-version>2.0.1</commons-httpclient-version>
-    <commons-logging-version>1.1</commons-logging-version>
-    <commons-pool-version>1.2</commons-pool-version>
-    <commons-primitives-version>1.0</commons-primitives-version>
-    <directory-asn1-version>0.3.2</directory-asn1-version>
-    <directory-kerboros-version>0.5</directory-kerboros-version>
-    <directory-mina-version>0.7.3</directory-mina-version>
-    <directory-version>0.9.2</directory-version>
-    <geronimo-version>1.0</geronimo-version>
-    <howl-version>0.1.8</howl-version>
-    <hsqldb-version>1.7.2.2</hsqldb-version>
-    <jdom-version>1.0</jdom-version>
-    <jetty-version>6.0.1</jetty-version>
-    <jmock-version>1.0.1</jmock-version>
-    <junit-version>3.8.1</junit-version>
-    <jxta-version>2.0</jxta-version>
-    <log4j-version>1.2.12</log4j-version>
-    <org-apache-derby-version>10.1.3.1</org-apache-derby-version>
-    <org-apache-geronimo-specs-version>1.0</org-apache-geronimo-specs-version>
-    <org-apache-maven-surefire-plugin-version>2.2</org-apache-maven-surefire-plugin-version>
-    <p2psockets-version>1.1.2</p2psockets-version>
-    <regexp-version>1.3</regexp-version>
-    <rome-version>0.8</rome-version>
-    <stax-version>1.1.1-dev</stax-version>
-    <xalan-version>2.6.0</xalan-version>
-    <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
-    <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
-    <xstream-version>1.1.2</xstream-version>
-    <xbean-version>2.8</xbean-version>
-    <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-incubating-repository</dist-repo-url>
-    <m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
-    <site-repo-url>scpexe://people.apache.org/www/incubator.apache.org/activemq/maven/</site-repo-url>
-  </properties>
 </project>