X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fmisc.xml;h=e85251b574d0c631aaeff2d27961bc60353349c2;hb=1434522acfcc29690ddd23aa8e122c0ef0710dc6;hp=bb210237aab69564d289b9b4bf3668cb6f2c5721;hpb=802f29eeaa54f7ea58b4d318d90b16806e24dea0;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index bb21023..e85251b 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -38,12 +38,27 @@
 			<props merge="true">
 				<prop key="Import-Package">
 					org.hamcrest;resolution:=optional,
+					org.hamcrest.core;resolution:=optional,
 					*
 				</prop>
 			</props>
 		</property>
 	</bean>
 
+	<bean id="EDU.oswego.cs.dl.util.concurrent" p:sourceCoords="concurrent:concurrent:1.3.4"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
+		</property>
+	</bean>
+
+	<bean id="org.openid4java" p:sourceCoords="org.openid4java:openid4java:0.9.8"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
 	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.184"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
@@ -53,6 +68,40 @@
 		</property>
 	</bean>
 
+	<!-- 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"
+		parent="template.mavenWrapper">
+		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</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 -->
 	<flow:flow name="misc/org.aspectj" spec="spec.version">
 		<flow:arg name="version" value="1.7.3" />
@@ -96,5 +145,4 @@
 			</property>
 		</bean>
 	</flow:flow>
-
 </beans>
\ No newline at end of file