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

distribution

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 01c3c92f9f22303f1d49823c7e438570a10f1a6b..2ae116c8ad8b31ff12eb31b5cddd7bd43dbc2733 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -19,6 +19,8 @@
                                <ref bean="org.junit" />
                                <ref bean="org.h2" />
                                <ref bean="joda-time" />
+                               <!-- This has been defined as optional via bnd -->
+                               <!--   <ref bean="com.jcraft.jzlib" /> -->
                                <ref bean="com.jcraft.jsch" />
                                <ref bean="EDU.oswego.cs.dl.util.concurrent" />
                                <ref bean="javax.el" />

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 148be0c794b4c4f870b467354997f1c343de19a1..e85251b574d0c631aaeff2d27961bc60353349c2 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -78,12 +78,28 @@
                </property>
        </bean>
 
+       <!--  Needed by jsch -->
+       <!--  <bean id="com.jcraft.jzlib" p:sourceCoords="com.jcraft:jzlib:1.1.3"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+               </property>
+       </bean> -->
+
        <bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
                parent="template.mavenWrapper">
                <!--  <property name="doNotModify" value="true" />  -->
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
                </property>
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       com.jcraft.jzlib;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
        </bean>
 
        <!-- AspectJ Factory -->