From 8b68c62249fb192f6f062180207995a6d8d4698f Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Thu, 2 Aug 2007 13:03:33 +0000
Subject: [PATCH] Switched from using ${activemq-version} to using ${version}
 added a required dependency in activemq-web to spring-web

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@562099 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-core/pom.xml |  2 +-
 activemq-web/pom.xml  |  7 +++++++
 pom.xml               | 37 +++++++++++++++++++------------------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index b77ca9a417..0f21046ab0 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -475,7 +475,7 @@
         <dependency>
           <groupId>org.apache.activemq</groupId>
           <artifactId>activemq-openwire-generator</artifactId>
-          <version>${activemq-version}</version>
+          <version>${version}</version>
           <optional>true</optional>
         </dependency>
       </dependencies>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 3003db4f2b..5d13adc94e 100755
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -83,6 +83,13 @@
       <artifactId>xbean-spring</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring-version}</version>
+      <optional>false</optional>      
+    </dependency>
+
     <dependency>
       <groupId>xmlpull</groupId>
       <artifactId>xmlpull</artifactId>
diff --git a/pom.xml b/pom.xml
index 7ab2d74b45..b0db00eea2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,8 @@
   <name>ActiveMQ</name>
 
   <properties>
-    <activemq-version>5.0-SNAPSHOT</activemq-version>
+    <version>5.0-SNAPSHOT</version>
+    <spring-version>2.0.6</spring-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
     <ant-version>1.6.2</ant-version>
@@ -210,82 +211,82 @@
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-all</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-core</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-core</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-jaas</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-xmpp</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web-demo</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web-console</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-gbean-management</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-console</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-fileserver</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-optional</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-ra</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-rar</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
         <type>rar</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
         <type>war</type>
       </dependency>
       <dependency>
@@ -302,7 +303,7 @@
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-openwire-generator</artifactId>
-        <version>${activemq-version}</version>
+        <version>${version}</version>
       </dependency>
 
       <!-- =============================== -->
@@ -448,7 +449,7 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
-        <version>2.0.6</version>
+        <version>${spring-version}</version>
         <optional>true</optional>
         <exclusions>
           <exclusion>