You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dk...@apache.org on 2015/03/04 18:47:27 UTC
activemq git commit: Open up the xbean osgi import range to include
4.x
Repository: activemq
Updated Branches:
refs/heads/master 7fdfdeba7 -> cad1a2a8c
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/cad1a2a8
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/cad1a2a8
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/cad1a2a8
Branch: refs/heads/master
Commit: cad1a2a8cd82801c9d7b639d6c98916413d88d19
Parents: 7fdfdeb
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 4 12:41:23 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 4 12:43:44 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/cad1a2a8/activemq-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index f55a4ae..57ebc57 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/cad1a2a8/activemq-http/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 3ec5c15..7370997 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/cad1a2a8/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index b1821ff..8b54d82 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/cad1a2a8/activemq-web-console/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 8d677cd..1f1e641 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/cad1a2a8/activemq-web-demo/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index f74e5ba..5377c26 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,