X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=META-INF%2Fspring%2Fmisc.xml;h=ed8b0fc0bf97c3c4c2d6949225e4156f4912135f;hb=ce1310922805a8472c51af2993aebe7b22184d35;hp=148be0c794b4c4f870b467354997f1c343de19a1;hpb=b0801b748f7c3e1e36e75d27fb48c34d8a180ddf;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 148be0c..ed8b0fc 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -70,7 +70,7 @@
 
 	<!-- TODO: Rather use the binary provided here: https://github.com/JodaOrg/joda-time/releases 
 		once the archiveMapper can manage tar.gz archives -->
-	<bean id="joda-time" p:sourceCoords="joda-time:joda-time:2.6"
+	<bean id="org.joda.time" p:sourceCoords="joda-time:joda-time:2.6"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
 		<property name="license">
@@ -78,12 +78,27 @@
 		</property>
 	</bean>
 
+	<!--  Needed by jsch: it is defined as optional via bnd -->
+	<!--  <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 -->