You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2016/05/20 13:15:25 UTC

[1/2] activemq git commit: AMQ-6298: Moved Spring Import-Package wildcard below other Spring imports.

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x 405280ecc -> 6d539b4f0
  refs/heads/master 088301114 -> 8b7632cb4


AMQ-6298: Moved Spring Import-Package wildcard below other Spring
imports.


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

Branch: refs/heads/master
Commit: 8b7632cb4f6aaa0d7d7c2febab5e60b6abcf3dff
Parents: 0883011
Author: Seth Leger <se...@opennms.org>
Authored: Fri May 20 04:57:51 2016 -0400
Committer: Seth Leger <se...@opennms.org>
Committed: Fri May 20 05:01:51 2016 -0400

----------------------------------------------------------------------
 activemq-osgi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/8b7632cb/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 0f88d38..a9975c8 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -56,10 +56,10 @@
       org.apache.zookeeper*;resolution:=optional,
       org.fusesource.leveldbjni*;resolution:=optional,
       org.fusesource.hawtjni*;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.springframework*;version="[3,5)";resolution:=optional,
       org.xmlpull*;resolution:=optional,
       scala*;resolution:=optional,
       org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)",


[2/2] activemq git commit: AMQ-6298: Moved Spring Import-Package wildcard below other Spring imports.

Posted by da...@apache.org.
AMQ-6298: Moved Spring Import-Package wildcard below other Spring
imports.


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

Branch: refs/heads/activemq-5.13.x
Commit: 6d539b4f0127285f77c350a474a5bde867c34d72
Parents: 405280e
Author: Seth Leger <se...@opennms.org>
Authored: Fri May 20 04:57:51 2016 -0400
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Fri May 20 15:15:11 2016 +0200

----------------------------------------------------------------------
 activemq-osgi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/6d539b4f/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 9efc733..8801443 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -56,10 +56,10 @@
       org.apache.zookeeper*;resolution:=optional,
       org.fusesource.leveldbjni*;resolution:=optional,
       org.fusesource.hawtjni*;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.springframework*;version="[3,5)";resolution:=optional,
       org.xmlpull*;resolution:=optional,
       scala*;resolution:=optional,
       org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)",