From: Bruno Sinou <bsinou@argeo.org>
Date: Tue, 6 Jan 2015 18:46:04 +0000 (+0100)
Subject: Mark jcraft.jzlib as optionnal for jsch rather than adding it to the
X-Git-Tag: v2.3.9~116
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=1434522acfcc29690ddd23aa8e122c0ef0710dc6

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 01c3c92..2ae116c 100644
--- 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 148be0c..e85251b 100644
--- 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 -->