Repository: activemq Updated Branches: refs/heads/master 38a6bedf9 -> ebf27cb39
https://issues.apache.org/jira/browse/AMQ-5957 Updating to Spring 4.1.7.RELEASE Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ebf27cb3 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ebf27cb3 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ebf27cb3 Branch: refs/heads/master Commit: ebf27cb39822d49d93fa40881dca640acec52a32 Parents: 38a6bed Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Sun Sep 20 15:30:48 2015 +0000 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Sun Sep 20 15:30:48 2015 +0000 ---------------------------------------------------------------------- activemq-osgi/pom.xml | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ebf27cb3/activemq-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index 0513c24..46e2952 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -56,12 +56,12 @@ org.apache.zookeeper*;resolution:=optional, org.fusesource.leveldbjni*;resolution:=optional, org.fusesource.hawtjni*;resolution:=optional, - org.springframework.jms*;version="[3,4]";resolution:=optional, + org.springframework.jms*;version="[3,5]";resolution:=optional, org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional, - org.springframework.transaction*;version="[3,4]";resolution:=optional, + org.springframework.transaction*;version="[3,5]";resolution:=optional, org.xmlpull*;resolution:=optional, scala*;resolution:=optional, - org.springframework*;version="[3,4]";resolution:=optional, + org.springframework*;version="[3,5]";resolution:=optional, org.springframework.osgi*;version="[1,4]";resolution:=optional, org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)", org.apache.xbean*;version="[3.13,5)", http://git-wip-us.apache.org/repos/asf/activemq/blob/ebf27cb3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7bbc1ab..1b71092 100755 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ <scalatest-version>2.1.5</scalatest-version> <slf4j-version>1.7.10</slf4j-version> <snappy-version>1.1.0.1</snappy-version> - <spring-version>3.2.11.RELEASE</spring-version> + <spring-version>4.1.7.RELEASE</spring-version> <spring-osgi-version>1.2.1</spring-osgi-version> <stax2-api-version>3.0.2</stax2-api-version> <velocity-version>1.7</velocity-version>
