X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.jackrabbit.xml;h=00491863ecf7a20aacc66c3cbc0c83ff20763e2b;hb=585573bd4db81adf7c81abe52977390b74e0162e;hp=878629e6496df07314fd5e0576ad6e75abc4c6a0;hpb=5b0263d306f93e0e2d08042f4b38056ecc19164e;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 878629e..0049186 100644
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -1,53 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:flow="http://www.argeo.org/schema/slc-flow"
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	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" />
-		<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"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-commons:@{version}" />
-		<bean id="org.apache.jackrabbit.spi" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi:@{version}" />
-		<bean id="org.apache.jackrabbit.spi.commons" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi-commons:@{version}" />
-		<bean id="org.apache.jackrabbit.data" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-data:@{version}">
+	<flow:flow name="apache/org.apache.jackrabbit"
+		spec="spec.version">
+		<flow:arg name="version" value="2.18.3" />
+		<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" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-commons:@{version}" />
+		<bean id="org.apache.jackrabbit.spi"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi:@{version}" />
+		<bean id="org.apache.jackrabbit.spi.commons"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi-commons:@{version}" />
+		<bean id="org.apache.jackrabbit.data"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-data:@{version}">
 			<property name="bndProperties">
 				<props merge="true">
-					<prop key="Fragment-Host"><![CDATA[org.apache.jackrabbit.core]]></prop>
+					<prop key="Fragment-Host">org.apache.jackrabbit.core</prop>
+					<prop key="Import-Package">
+						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>
+			</property>
+		</bean>
+		<bean id="org.apache.jackrabbit.core"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-core:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Import-Package">
+						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>
+			</property>
+		</bean>
+		<bean id="org.apache.jackrabbit.jcr.client"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-client:@{version}" />
+		<bean id="org.apache.jackrabbit.server"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-server:@{version}" />
+		<bean id="org.apache.jackrabbit.servlet"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-servlet:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Fragment-Host">org.apache.jackrabbit.core</prop>
+					<prop key="Import-Package">
+						org.apache.jackrabbit.rmi.*;resolution:=optional,
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
+		<bean id="org.apache.jackrabbit.webdav"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-webdav:@{version}" />
+		<bean id="org.apache.jackrabbit.spi2dav"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi2dav:@{version}" />
+		<bean id="org.apache.jackrabbit.spi2jcr"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi2jcr:@{version}" />
+		<bean id="org.apache.jackrabbit.jcr2dav"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr2dav:@{version}" />
+		<bean id="org.apache.jackrabbit.jcr2spi"
+			parent="template.jackrabbitMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr2spi:@{version}" />
+		<!-- <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"> -->
+		<!-- * -->
+		<!-- </prop> -->
+		<!-- </props> -->
+		<!-- </property> -->
+		<!-- </bean> -->
+	</flow:flow>
+
+	<flow:flow name="apache/org.apache.jackrabbit.vault"
+		spec="spec.version">
+		<flow:arg name="version" value="3.4.0" />
+		<bean id="org.apache.jackrabbit.vault"
+			parent="template.jackrabbitMaven"
+			p:sourceCoords="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Import-Package">
+						org.apache.sling.jcr.api;resolution:="optional",
+						*
+					</prop>
 				</props>
 			</property>
 		</bean>
-		<bean id="org.apache.jackrabbit.core" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-core:@{version}" />
-		<bean id="org.apache.jackrabbit.jcr.client" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-client:@{version}" />
-		<bean id="org.apache.jackrabbit.jcr.server" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-server:@{version}" />
-		<bean id="org.apache.jackrabbit.webdav" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-webdav:@{version}" />
-		<bean id="org.apache.jackrabbit.spi2dav" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi2dav:@{version}" />
-		<bean id="org.apache.jackrabbit.spi2jcr" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi2jcr:@{version}" />
-		<bean id="org.apache.jackrabbit.jcr2dav" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr2dav:@{version}" />
-		<bean id="org.apache.jackrabbit.webapp" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-webapp:@{version}" />
 	</flow:flow>
 
 	<bean id="template.jackrabbitMaven" parent="template.mavenWrapper"
 		abstract="true">
-		<property name="groupId" value="org.argeo.tp.apache.jackrabbit" />
+		<property name="groupId"
+			value="org.argeo.tp.apache.jackrabbit" />
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<!-- <property name="doNotModify" value="true" /> -->
 	</bean>