From: mbaudier <mbaudier@argeo.org>
Date: Sat, 3 Jan 2015 15:01:32 +0000 (+0100)
Subject: Fix so that Argeo COmmons tests are working
X-Git-Tag: v2.3.9~123
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=b7f5690cf439e3fc30ccf64f75628f83b874beb2

Fix so that Argeo COmmons tests are working
---

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 7faad97..76b81f3 100644
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -23,7 +23,6 @@
 				<props merge="true">
 					<prop key="Fragment-Host">org.apache.jackrabbit.core</prop>
 					<prop key="Import-Package">
-						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
 						org.apache.jackrabbit.test;resolution:=optional,
 						*
 					</prop>
@@ -35,7 +34,6 @@
 			<property name="bndProperties">
 				<props merge="true">
 					<prop key="Import-Package">
-						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
 						org.apache.jackrabbit.test;resolution:=optional,
 						*
 					</prop>
@@ -76,7 +74,6 @@
 			<property name="bndProperties">
 				<props merge="true">
 					<prop key="Import-Package">
-						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
 						*
 					</prop>
 				</props>
diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index bdd644d..becf05e 100644
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -18,7 +18,7 @@
 		<bean id="org.apache.tika.core" parent="template.tikaMaven"
 			p:sourceCoords="org.apache.tika:tika-core:@{version}" />
 		<bean id="org.apache.tika.parser" parent="template.tikaMaven"
-			p:sourceCoords="org.apache.tika:tika-core:@{version}" />
+			p:sourceCoords="org.apache.tika:tika-parsers:@{version}" />
 	</flow:flow>
 
 	<bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 8ead12f..bfaa8f6 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -18,7 +18,7 @@
 				<ref bean="org.aopalliance" />
 				<ref bean="org.junit" />
 				<ref bean="org.h2" />
-				<!-- <ref bean="org.openid4java" /> -->
+				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
 				<ref bean="javax.el" />
 				<ref bean="javax.inject" />
 				<ref bean="misc/org.aspectj" />
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 9b8e305..26bad87 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -45,6 +45,13 @@
 		</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">