activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject activemq git commit: Open up the xbean osgi import range to include 4.x
Date Wed, 04 Mar 2015 17:48:10 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.11.x 50299b264 -> bf7d0fd32


Open up the xbean osgi import range to include 4.x


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

Branch: refs/heads/activemq-5.11.x
Commit: bf7d0fd325a71722c40203cf0bfcb9f45365c024
Parents: 50299b2
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Mar 4 12:41:23 2015 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Mar 4 12:47:59 2015 -0500

----------------------------------------------------------------------
 activemq-blueprint/pom.xml   | 2 +-
 activemq-http/pom.xml        | 1 +
 activemq-osgi/pom.xml        | 3 ++-
 activemq-web-console/pom.xml | 1 +
 activemq-web-demo/pom.xml    | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/bf7d0fd3/activemq-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 6108a52..d2cc150 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -32,7 +32,7 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-        org.apache.xbean*;version="[3.13,4)",
+        org.apache.xbean*;version="[3.13,5)",
         org.apache.aries.blueprint.*;version="[1.0,2)",
           *
     </activemq.osgi.import.pkg>

http://git-wip-us.apache.org/repos/asf/activemq/blob/bf7d0fd3/activemq-http/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index a468014..8c806dc 100755
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -142,6 +142,7 @@
               !org.apache.activemq.transport.ws*;version=${project.version},
               !org.apache.activemq.transport.xstream;version=${project.version},
               !org.apache.activemq.transport.util;version=${project.version},
+              org.apache.xbean*;version="[3.13,5)",
               org.apache.activemq*;version=${project.version};resolution:=optional
             </Import-Package>
           </instructions>

http://git-wip-us.apache.org/repos/asf/activemq/blob/bf7d0fd3/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index de01a67..b60ca65 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -63,7 +63,8 @@
       scala*;resolution:=optional,
       org.springframework*;version="[3,4]";resolution:=optional,
       org.springframework.osgi*;version="[1,4]";resolution:=optional,
-      org.apache.xbean.spring*;resolution:=optional,
+      org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)",
+      org.apache.xbean*;version="[3.13,5)",
       javax.annotation*,
       javax.jms*,
       javax.management*,

http://git-wip-us.apache.org/repos/asf/activemq/blob/bf7d0fd3/activemq-web-console/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 9a7f1c0..60cd243 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -152,6 +152,7 @@
               javax.net.ssl,
               org.osgi.framework;version="[1.5,2)",
               org.osgi.service.cm,
+              org.apache.xbean*;version="[3.13,5)",
               org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
               org.slf4j;version="[1.6,2)";resolution:=optional,
               org.slf4j.spi;version="[1.6,2)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/activemq/blob/bf7d0fd3/activemq-web-demo/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 2a88798..4c085b9 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -124,6 +124,7 @@
               org.osgi.framework,
               org.osgi.service.cm,
               org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
+              org.apache.xbean*;version="[3.13,5)",
               org.slf4j;version="[1.6,2)";resolution:=optional,
               org.slf4j.spi;version="[1.6,2)";resolution:=optional,
               org.apache.log4j;version="[1.2.14,2)";resolution:=optional,


Mime
View raw message