2.1.4 - First snapshot - Next development cycle.

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

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index e85251b574d0c631aaeff2d27961bc60353349c2..ed8b0fc0bf97c3c4c2d6949225e4156f4912135f 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,7 +78,7 @@
                </property>
        </bean>
 
-       <!--  Needed by jsch -->
+       <!--  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">
@@ -88,7 +88,6 @@
 
        <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>