activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r916651 - in /activemq/trunk: activemq-optional/pom.xml assembly/src/main/descriptors/common-bin.xml assembly/src/release/conf/log4j.properties pom.xml
Date Fri, 26 Feb 2010 11:53:18 GMT
Author: dejanb
Date: Fri Feb 26 11:53:18 2010
New Revision: 916651

URL: http://svn.apache.org/viewvc?rev=916651&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2547 - upgrading trunk to spring 3.0.1.RELEASE

Modified:
    activemq/trunk/activemq-optional/pom.xml
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml
    activemq/trunk/assembly/src/release/conf/log4j.properties
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=916651&r1=916650&r2=916651&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Fri Feb 26 11:53:18 2010
@@ -68,7 +68,7 @@
         
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-core</artifactId>
       <version>${spring-version}</version>
     </dependency>
     <dependency>

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=916651&r1=916650&r2=916651&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Fri Feb 26 11:53:18 2010
@@ -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>

Modified: activemq/trunk/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/log4j.properties?rev=916651&r1=916650&r2=916651&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/log4j.properties (original)
+++ activemq/trunk/assembly/src/release/conf/log4j.properties Fri Feb 26 11:53:18 2010
@@ -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

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=916651&r1=916650&r2=916651&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Feb 26 11:53:18 2010
@@ -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>



Mime
View raw message