You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/10/03 10:22:49 UTC

svn commit: r1528743 - in /karaf/cellar/trunk: bundle/pom.xml cloud/pom.xml config/pom.xml core/pom.xml dosgi/pom.xml event/pom.xml features/pom.xml hazelcast/pom.xml obr/pom.xml shell/pom.xml utils/pom.xml webconsole/pom.xml

Author: jbonofre
Date: Thu Oct  3 08:22:48 2013
New Revision: 1528743

URL: http://svn.apache.org/r1528743
Log:
[KARAF-2480] Fix dynamic import in Cellar modules

Modified:
    karaf/cellar/trunk/bundle/pom.xml
    karaf/cellar/trunk/cloud/pom.xml
    karaf/cellar/trunk/config/pom.xml
    karaf/cellar/trunk/core/pom.xml
    karaf/cellar/trunk/dosgi/pom.xml
    karaf/cellar/trunk/event/pom.xml
    karaf/cellar/trunk/features/pom.xml
    karaf/cellar/trunk/hazelcast/pom.xml
    karaf/cellar/trunk/obr/pom.xml
    karaf/cellar/trunk/shell/pom.xml
    karaf/cellar/trunk/utils/pom.xml
    karaf/cellar/trunk/webconsole/pom.xml

Modified: karaf/cellar/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/pom.xml (original)
+++ karaf/cellar/trunk/bundle/pom.xml Thu Oct  3 08:22:48 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/trunk/cloud/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/cloud/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/cloud/pom.xml (original)
+++ karaf/cellar/trunk/cloud/pom.xml Thu Oct  3 08:22:48 2013
@@ -42,7 +42,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/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/config/pom.xml (original)
+++ karaf/cellar/trunk/config/pom.xml Thu Oct  3 08:22:48 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/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/core/pom.xml (original)
+++ karaf/cellar/trunk/core/pom.xml Thu Oct  3 08:22:48 2013
@@ -39,7 +39,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/trunk/dosgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/dosgi/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/dosgi/pom.xml (original)
+++ karaf/cellar/trunk/dosgi/pom.xml Thu Oct  3 08:22:48 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/trunk/event/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/event/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/event/pom.xml (original)
+++ karaf/cellar/trunk/event/pom.xml Thu Oct  3 08:22:48 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.event*;version="${project.version}"
         </osgi.export>

Modified: karaf/cellar/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/features/pom.xml (original)
+++ karaf/cellar/trunk/features/pom.xml Thu Oct  3 08:22:48 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/trunk/hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/pom.xml (original)
+++ karaf/cellar/trunk/hazelcast/pom.xml Thu Oct  3 08:22:48 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/trunk/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/pom.xml (original)
+++ karaf/cellar/trunk/obr/pom.xml Thu Oct  3 08:22:48 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/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/pom.xml (original)
+++ karaf/cellar/trunk/shell/pom.xml Thu Oct  3 08:22:48 2013
@@ -46,7 +46,7 @@
             org.apache.karaf.shell.commands;version="[3,4)",
             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/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/pom.xml (original)
+++ karaf/cellar/trunk/utils/pom.xml Thu Oct  3 08:22:48 2013
@@ -39,7 +39,7 @@
             org.apache.karaf.cellar.core*;version="${project.version}",
             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/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/webconsole/pom.xml?rev=1528743&r1=1528742&r2=1528743&view=diff
==============================================================================
--- karaf/cellar/trunk/webconsole/pom.xml (original)
+++ karaf/cellar/trunk/webconsole/pom.xml Thu Oct  3 08:22:48 2013
@@ -40,7 +40,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>