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 7faad97f0b4249cad99413ba6353b627fe10b714..76b81f3fac40b693188e98fbf0545c7e92b060af 100644 (file)
--- 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 bdd644d7cbeecbbbd544a92501cbe344d996f4bf..becf05e0a0daf80370114ebf77f8bb01614ea609 100644 (file)
--- 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 8ead12f23021ba4ae6e2274785f08c87c07861cc..bfaa8f666659f514f86be8a78616fb60d242300c 100644 (file)
--- 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 9b8e305cae7c6dc7de1499b53e06b2023b67e9f8..26bad87128d7d8672e3ef01be726ded8f268f0a0 100644 (file)
--- 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">