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:23:18 UTC

[43/50] [abbrv] 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/trunk@1528743 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/0dda1462
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/0dda1462
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/0dda1462

Branch: refs/heads/master
Commit: 0dda1462a8f4f597780456c1dd78933cf540da1f
Parents: 83431c1
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu Oct 3 08:22:48 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu Oct 3 08:22:48 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/0dda1462/bundle/pom.xml
----------------------------------------------------------------------
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 88bdbf2..fce2daa 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/0dda1462/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/cloud/pom.xml b/cloud/pom.xml
index 29d0d78..08bcece 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/0dda1462/config/pom.xml
----------------------------------------------------------------------
diff --git a/config/pom.xml b/config/pom.xml
index a57c6ef..d33396f 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/0dda1462/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4f4682a..94d59e1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/0dda1462/dosgi/pom.xml
----------------------------------------------------------------------
diff --git a/dosgi/pom.xml b/dosgi/pom.xml
index aa4650d..d22efde 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/0dda1462/event/pom.xml
----------------------------------------------------------------------
diff --git a/event/pom.xml b/event/pom.xml
index 5d4b9a7..4cab00d 100644
--- a/event/pom.xml
+++ b/event/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.event*;version="${project.version}"
         </osgi.export>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/0dda1462/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index df8cb56..cfad1b2 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/0dda1462/hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index b17e5e9..0447803 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/0dda1462/obr/pom.xml
----------------------------------------------------------------------
diff --git a/obr/pom.xml b/obr/pom.xml
index 38e48a0..132476d 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/0dda1462/shell/pom.xml
----------------------------------------------------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index b75eee8..6426e24 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/0dda1462/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 276f9ed..ce5948b 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/0dda1462/webconsole/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 11619d7..ecba450 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -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>