Mark jcraft.jzlib as optionnal for jsch rather than adding it to the

[gpl/argeo-tp.git] / META-INF / spring / apache.jackrabbit.xml

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 7faad97f0b4249cad99413ba6353b627fe10b714..f5867e82e989b48323bca6ce53ba5011aa10a57c 100644 (file)
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -23,8 +23,16 @@
                                <props merge="true">
                                        <prop key="Fragment-Host">org.apache.jackrabbit.core</prop>
                                        <prop key="Import-Package">
-                                               EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
                                                org.apache.jackrabbit.test;resolution:=optional,
+                                               org.apache.derby.*;resolution:=optional,
+                                               org.h2;resolution:=optional,
+                                               org.postgresql;resolution:=optional,
+                                               oracle.jdbc;resolution:=optional,
+                                               org.gjt.mm.mysql;resolution:=optional,
+                                               com.mysql.jdbc;resolution:=optional,
+                                               com.microsoft.sqlserver.jdbc;resolution:=optional,
+                                               net.sourceforge.jtds.jdbc;resolution:=optional,
+                                               org.hsqldb;resolution:=optional,
                                                *
                                        </prop>
                                </props>
@@ -35,8 +43,16 @@
                        <property name="bndProperties">
                                <props merge="true">
                                        <prop key="Import-Package">
-                                               EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
                                                org.apache.jackrabbit.test;resolution:=optional,
+                                               org.apache.derby.*;resolution:=optional,
+                                               org.h2;resolution:=optional,
+                                               org.postgresql;resolution:=optional,
+                                               oracle.jdbc;resolution:=optional,
+                                               org.gjt.mm.mysql;resolution:=optional,
+                                               com.mysql.jdbc;resolution:=optional,
+                                               com.microsoft.sqlserver.jdbc;resolution:=optional,
+                                               net.sourceforge.jtds.jdbc;resolution:=optional,
+                                               org.hsqldb;resolution:=optional,
                                                *
                                        </prop>
                                </props>
@@ -76,7 +92,6 @@
                        <property name="bndProperties">
                                <props merge="true">
                                        <prop key="Import-Package">
-                                               EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
                                                *
                                        </prop>
                                </props>