Author: jbonofre
Date: Thu Oct 3 08:05:36 2013
New Revision: 1528738
URL: http://svn.apache.org/r1528738
Log:
[KARAF-2480] Fix dynamic import in Cellar modules
Modified:
karaf/cellar/branches/cellar-2.3.x/bundle/pom.xml
karaf/cellar/branches/cellar-2.3.x/cloud/pom.xml
karaf/cellar/branches/cellar-2.3.x/config/pom.xml
karaf/cellar/branches/cellar-2.3.x/core/pom.xml
karaf/cellar/branches/cellar-2.3.x/dosgi/pom.xml
karaf/cellar/branches/cellar-2.3.x/event/pom.xml
karaf/cellar/branches/cellar-2.3.x/features/pom.xml
karaf/cellar/branches/cellar-2.3.x/hazelcast/pom.xml
karaf/cellar/branches/cellar-2.3.x/obr/pom.xml
karaf/cellar/branches/cellar-2.3.x/shell/pom.xml
karaf/cellar/branches/cellar-2.3.x/utils/pom.xml
karaf/cellar/branches/cellar-2.3.x/webconsole/pom.xml
Modified: karaf/cellar/branches/cellar-2.3.x/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/bundle/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/bundle/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/bundle/pom.xml Thu Oct 3 08:05:36 2013
@@ -47,7 +47,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.bundle*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/cloud/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/cloud/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/cloud/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/cloud/pom.xml Thu Oct 3 08:05:36 2013
@@ -43,7 +43,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
-
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,org.jclouds.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,org.jclouds.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.cloud*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/pom.xml Thu Oct 3 08:05:36 2013
@@ -46,7 +46,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.config*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/core/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/core/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/core/pom.xml Thu Oct 3 08:05:36 2013
@@ -40,7 +40,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.core*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/dosgi/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/dosgi/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/dosgi/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/dosgi/pom.xml Thu Oct 3 08:05:36 2013
@@ -46,7 +46,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.dosgi*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/event/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/event/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/event/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/event/pom.xml Thu Oct 3 08:05:36 2013
@@ -41,7 +41,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.event*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/features/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/features/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/features/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/features/pom.xml Thu Oct 3 08:05:36 2013
@@ -47,7 +47,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.features*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/pom.xml Thu Oct 3 08:05:36
2013
@@ -44,7 +44,7 @@
org.osgi*,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.hazelcast*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/obr/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/obr/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/obr/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/obr/pom.xml Thu Oct 3 08:05:36 2013
@@ -50,7 +50,8 @@
</osgi.import>
<osgi.dynamic.import>
org.apache.felix.bundlerepository,
- org.osgi.service.obr
+ org.osgi.service.obr,
+ *
</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.obr*;version=${project.version}
Modified: karaf/cellar/branches/cellar-2.3.x/shell/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/shell/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/shell/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/shell/pom.xml Thu Oct 3 08:05:36 2013
@@ -46,7 +46,7 @@
org.osgi.service.cm;version="[1.4,2)",
org.osgi*
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.shell*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/utils/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/utils/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/utils/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/utils/pom.xml Thu Oct 3 08:05:36 2013
@@ -40,7 +40,7 @@
org.osgi.service.cm;version="[1.4,2)",
org.osgi*
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.utils*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/branches/cellar-2.3.x/webconsole/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/webconsole/pom.xml?rev=1528738&r1=1528737&r2=1528738&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/webconsole/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/webconsole/pom.xml Thu Oct 3 08:05:36
2013
@@ -41,7 +41,7 @@
org.osgi.service.blueprint,
org.slf4j;resolution:=optional
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+
<osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.webconsole*;version="${project.version}"
</osgi.export>
