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/12/18 13:27:55 UTC

[40/50] git commit: [KARAF-2480] Fix dynamic import in Cellar modules

[KARAF-2480] Fix dynamic import in Cellar modules

git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.3.x@1528738 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/388b42fe
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/388b42fe
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/388b42fe

Branch: refs/heads/cellar-2.3.x
Commit: 388b42fefc0684525e77f819979e8b6cf9763755
Parents: 495fdb9
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu Oct 3 08:05:36 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu Oct 3 08:05:36 2013 +0000

----------------------------------------------------------------------
 bundle/pom.xml     | 2 +-
 cloud/pom.xml      | 2 +-
 config/pom.xml     | 2 +-
 core/pom.xml       | 2 +-
 dosgi/pom.xml      | 2 +-
 event/pom.xml      | 2 +-
 features/pom.xml   | 2 +-
 hazelcast/pom.xml  | 2 +-
 obr/pom.xml        | 3 ++-
 shell/pom.xml      | 2 +-
 utils/pom.xml      | 2 +-
 webconsole/pom.xml | 2 +-
 12 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/bundle/pom.xml
----------------------------------------------------------------------
diff --git a/bundle/pom.xml b/bundle/pom.xml
index f206107..d5f0ebd 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/cloud/pom.xml b/cloud/pom.xml
index a24e0ae..09e3809 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/config/pom.xml
----------------------------------------------------------------------
diff --git a/config/pom.xml b/config/pom.xml
index bfdd281..9667f63 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index db685a9..1d66a30 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/dosgi/pom.xml
----------------------------------------------------------------------
diff --git a/dosgi/pom.xml b/dosgi/pom.xml
index 15f17dc..8f1b255 100644
--- a/dosgi/pom.xml
+++ b/dosgi/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/event/pom.xml
----------------------------------------------------------------------
diff --git a/event/pom.xml b/event/pom.xml
index 8d2014d..ae2223b 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 33f6517..f8442c0 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index 177d547..dffc24a 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/obr/pom.xml
----------------------------------------------------------------------
diff --git a/obr/pom.xml b/obr/pom.xml
index 51137dd..037a510 100644
--- a/obr/pom.xml
+++ b/obr/pom.xml
@@ -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}

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/shell/pom.xml
----------------------------------------------------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index f98aa46..f50e72b 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 1c6c468..35980ce 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/388b42fe/webconsole/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 06c1e36..06d11e7 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -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>