X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.jackrabbit.xml;h=8f4ca80bea713ae2339099abc97bf7d5d59699b7;hb=abfecf8c72b0fe119f6398afaa5aff278ca59456;hp=7faad97f0b4249cad99413ba6353b627fe10b714;hpb=598457a8a982be73a4a0137605e824ce50491fae;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 7faad97..8f4ca80 100644
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -8,7 +8,7 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
 	<flow:flow name="apache/org.apache.jackrabbit" spec="spec.version">
-		<flow:arg name="version" value="2.8.0" />
+		<flow:arg name="version" value="2.16.0" />
 		<bean id="org.apache.jackrabbit.api" parent="template.jackrabbitMaven"
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-api:@{version}" />
 		<bean id="org.apache.jackrabbit.jcr.commons" parent="template.jackrabbitMaven"
@@ -23,8 +23,16 @@
 				<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,
+						org.apache.derby.*;resolution:=optional,
+						org.h2;resolution:=optional,
+						org.postgresql;resolution:=optional,
+						oracle.jdbc;resolution:=optional,
+						org.gjt.mm.mysql;resolution:=optional,
+						com.mysql.jdbc;resolution:=optional,
+						com.microsoft.sqlserver.jdbc;resolution:=optional,
+						net.sourceforge.jtds.jdbc;resolution:=optional,
+						org.hsqldb;resolution:=optional,
 						*
 					</prop>
 				</props>
@@ -35,8 +43,16 @@
 			<property name="bndProperties">
 				<props merge="true">
 					<prop key="Import-Package">
-						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
 						org.apache.jackrabbit.test;resolution:=optional,
+						org.apache.derby.*;resolution:=optional,
+						org.h2;resolution:=optional,
+						org.postgresql;resolution:=optional,
+						oracle.jdbc;resolution:=optional,
+						org.gjt.mm.mysql;resolution:=optional,
+						com.mysql.jdbc;resolution:=optional,
+						com.microsoft.sqlserver.jdbc;resolution:=optional,
+						net.sourceforge.jtds.jdbc;resolution:=optional,
+						org.hsqldb;resolution:=optional,
 						*
 					</prop>
 				</props>
@@ -71,17 +87,16 @@
 		<!-- <bean id="org.apache.jackrabbit.webapp" parent="template.jackrabbitMaven" -->
 		<!-- p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-webapp:@{version}" 
 			/> -->
-		<bean id="org.apache.jackrabbit.test" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-tests:@{version}">
-			<property name="bndProperties">
-				<props merge="true">
-					<prop key="Import-Package">
-						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
-						*
-					</prop>
-				</props>
-			</property>
-		</bean>
+		<!-- <bean id="org.apache.jackrabbit.test" parent="template.jackrabbitMaven" -->
+		<!-- p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-tests:@{version}"> -->
+		<!-- <property name="bndProperties"> -->
+		<!-- <props merge="true"> -->
+		<!-- <prop key="Import-Package"> -->
+		<!-- * -->
+		<!-- </prop> -->
+		<!-- </props> -->
+		<!-- </property> -->
+		<!-- </bean> -->
 	</flow:flow>
 
 	<bean id="template.jackrabbitMaven" parent="template.mavenWrapper"