Change Joda symbolic name

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

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 148be0c794b4c4f870b467354997f1c343de19a1..c7f33093cf25fee1e7125c813fb5f41099a02d66 100644 (file)
--- 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,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 -->