Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Bosanac Dejan 2010-02-26 11:53:18 +00:00
parent 3e4fc0a678
commit eac31e8417
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-optional/pom.xml
View File

@ -68,7 +68,7 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring</artifactId> <artifactId>spring-core</artifactId>
<version>${spring-version}</version> <version>${spring-version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
assembly/src/main/descriptors/common-bin.xml
View File

@ -209,6 +209,8 @@
<include>org.springframework:spring-context</include> <include>org.springframework:spring-context</include>
<include>org.springframework:spring-tx</include> <include>org.springframework:spring-tx</include>
<include>org.springframework:spring-jms</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>com.thoughtworks.xstream:xstream</include>
<include>xmlpull:xmlpull</include> <include>xmlpull:xmlpull</include>
<include>org.codehaus.woodstox:woodstox-core-asl</include> <include>org.codehaus.woodstox:woodstox-core-asl</include>

1
assembly/src/release/conf/log4j.properties
View File

@ -21,6 +21,7 @@
# #
log4j.rootLogger=INFO, console, logfile log4j.rootLogger=INFO, console, logfile
log4j.logger.org.apache.activemq.spring=WARN log4j.logger.org.apache.activemq.spring=WARN
log4j.logger.org.apache.activemq.web.handler=WARN
log4j.logger.org.springframework=WARN log4j.logger.org.springframework=WARN
log4j.logger.org.apache.xbean=WARN log4j.logger.org.apache.xbean=WARN
log4j.logger.org.apache.camel=ERROR log4j.logger.org.apache.camel=ERROR

2
pom.xml
View File

@ -36,7 +36,7 @@
<projectName>Apache ActiveMQ</projectName> <projectName>Apache ActiveMQ</projectName>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging --> <!-- 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> <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> <spring-osgi-version>1.2.1</spring-osgi-version>
<activesoap-version>1.3</activesoap-version> <activesoap-version>1.3</activesoap-version>
<annogen-version>0.1.0</annogen-version> <annogen-version>0.1.0</annogen-version>