From eac31e8417a75f9c17a4bfb9b7c5e025da984811 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Fri, 26 Feb 2010 11:53:18 +0000
Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-2547 -
 upgrading trunk to spring 3.0.1.RELEASE

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@916651 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-optional/pom.xml                    | 2 +-
 assembly/src/main/descriptors/common-bin.xml | 2 ++
 assembly/src/release/conf/log4j.properties   | 1 +
 pom.xml                                      | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index a4f3b9559b..6f3e3bed12 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -68,7 +68,7 @@
         
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-core</artifactId>
       <version>${spring-version}</version>
     </dependency>
     <dependency>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index ab812eb3b8..576b31780c 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -209,6 +209,8 @@
         <include>org.springframework:spring-context</include>
         <include>org.springframework:spring-tx</include>
         <include>org.springframework:spring-jms</include>
+        <include>org.springframework:spring-asm</include>
+        <include>org.springframework:spring-expression</include>
         <include>com.thoughtworks.xstream:xstream</include>
         <include>xmlpull:xmlpull</include>
         <include>org.codehaus.woodstox:woodstox-core-asl</include>
diff --git a/assembly/src/release/conf/log4j.properties b/assembly/src/release/conf/log4j.properties
index 8cb9c4c981..eb85be9832 100755
--- a/assembly/src/release/conf/log4j.properties
+++ b/assembly/src/release/conf/log4j.properties
@@ -21,6 +21,7 @@
 #
 log4j.rootLogger=INFO, console, logfile
 log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.web.handler=WARN
 log4j.logger.org.springframework=WARN
 log4j.logger.org.apache.xbean=WARN
 log4j.logger.org.apache.camel=ERROR
diff --git a/pom.xml b/pom.xml
index 472f0bb09f..1cce764584 100755
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
     <projectName>Apache ActiveMQ</projectName>
     <!-- base url for site deployment.  See distribution management for full url.  Override this in settings.xml for staging -->
     <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
-    <spring-version>2.5.6</spring-version>
+    <spring-version>3.0.1.RELEASE</spring-version>
     <spring-osgi-version>1.2.1</spring-osgi-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>