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 @@ org.springframework - spring + spring-core ${spring-version} 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 @@ org.springframework:spring-context org.springframework:spring-tx org.springframework:spring-jms + org.springframework:spring-asm + org.springframework:spring-expression com.thoughtworks.xstream:xstream xmlpull:xmlpull org.codehaus.woodstox:woodstox-core-asl 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 @@ Apache ActiveMQ scp://people.apache.org/x1/www/activemq.apache.org - 2.5.6 + 3.0.1.RELEASE 1.2.1 1.3 0.1.0