You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2015/09/21 21:59:36 UTC

[1/2] activemq git commit: Update Import-Package to include Spring 4

Repository: activemq
Updated Branches:
  refs/heads/master 130455c92 -> c08efbe6c


Update Import-Package to include Spring 4

Update OSGi metadata to include Spring 4.X in the version range. Removed duplicate org.springframework.osgi* package reference.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/103efe1d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/103efe1d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/103efe1d

Branch: refs/heads/master
Commit: 103efe1d4bb4c6a01bdfaafff368b8103a343d3b
Parents: 130455c
Author: Seth Leger <se...@opennms.org>
Authored: Tue Jun 23 12:26:46 2015 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Sep 21 19:56:10 2015 +0000

----------------------------------------------------------------------
 activemq-osgi/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/103efe1d/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 46e2952..4414746 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -56,13 +56,12 @@
       org.apache.zookeeper*;resolution:=optional,
       org.fusesource.leveldbjni*;resolution:=optional,
       org.fusesource.hawtjni*;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,5]";resolution:=optional,
+      org.springframework*;version="[3,5)";resolution:=optional,
+      org.springframework.jms*;version="[3,5)";resolution:=optional,
+      org.springframework.osgi*;version="[1,4]";resolution:=optional,
+      org.springframework.transaction*;version="[3,5)";resolution:=optional,
       org.xmlpull*;resolution:=optional,
       scala*;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)",
       javax.annotation*,


[2/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5922

Posted by cs...@apache.org.
https://issues.apache.org/jira/browse/AMQ-5922

This closes #121

Thanks to Seth Leger


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c08efbe6
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c08efbe6
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c08efbe6

Branch: refs/heads/master
Commit: c08efbe6c2e490b1c00593df8fdbf93b847b971d
Parents: 130455c 103efe1
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Mon Sep 21 19:57:07 2015 +0000
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Sep 21 19:57:07 2015 +0000

----------------------------------------------------------------------
 activemq-osgi/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------