Update Jackrabbit to v2.18.3. Introduce FileVault.

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 4c8d342941a49e3dfca32e5bbe77d359574660d7..00491863ecf7a20aacc66c3cbc0c83ff20763e2b 100644 (file)
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -1,24 +1,32 @@
 <?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.16.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}">
+       <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">org.apache.jackrabbit.core</prop>
@@ -38,8 +46,9 @@
                                </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.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">
@@ -58,12 +67,15 @@
                                </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}">
+               <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>
@@ -74,16 +86,21 @@
                                </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.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}" 
                        /> -->
@@ -99,11 +116,30 @@
                <!-- </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>
+       </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>

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 9c28eaa5f2655115389fcd58d0af6fda196091ed..2c39891e3bf108f6096e6a2b0a20c1fc2fe8fb71 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -18,7 +18,7 @@
        </flow:flow>
 
        <flow:flow name="apache/org.apache.tika" spec="spec.version">
-               <flow:arg name="version" value="1.19" />
+               <flow:arg name="version" value="1.22" />
                <bean id="org.apache.tika.core" parent="template.tikaMaven"
                        p:sourceCoords="org.apache.tika:tika-core:@{version}">
                        <property name="doNotModify" value="true" />
@@ -61,7 +61,7 @@
 
        <!-- Needed by Apache SSHD in order to integrate with Unix agent -->
        <bean id="org.apache.tomcat.jni"
-               p:sourceCoords="org.apache.tomcat:tomcat-jni:9.0.17"
+               p:sourceCoords="org.apache.tomcat:tomcat-jni:9.0.26"
                parent="template.apacheMaven">
        </bean>
 
@@ -131,7 +131,7 @@
 
        <flow:flow name="apache/org.apache.pdfbox"
                spec="spec.version">
-               <flow:arg name="version" value="2.0.2" />
+               <flow:arg name="version" value="2.0.17" />
                <bean id="org.apache.pdfbox" parent="template.apacheMaven"
                        p:version="@{version}"
                        p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
@@ -148,7 +148,7 @@
        </flow:flow>
 
        <flow:flow name="apache/org.apache.poi" spec="spec.version">
-               <flow:arg name="version" value="4.0.0" />
+               <flow:arg name="version" value="4.1.0" />
                <!-- <bean id="org.apache.poi" parent="template.apacheMaven" -->
                <!-- p:version="@{version}" -->
                <!-- p:sourceCoords="org.apache.servicemix.bundles:org.apache.servicemix.bundles.poi:@{version}_1"> -->

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index ef9d782f4392d9a001ed4ecabe427bc01e1017a3..72734ff0fe6cdab8b3d555a54627b2403ce2b609 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -90,6 +90,7 @@
                                <ref bean="apache/org.apache.tika" />
                                <ref bean="apache/org.apache.lucene" />
                                <ref bean="apache/org.apache.jackrabbit" />
+                               <ref bean="apache/org.apache.jackrabbit.vault" />
 
                                <!-- Document generation and management -->
                                <ref bean="net.sf.jxl" />

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 90b0daf2b67fb96186c7e4f26dd0ef5fab4d2246..2b7b6609c6911852bb26288de84a9c4e8bf794da 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -36,7 +36,7 @@
                </property>
        </bean>
 
-       <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.197"
+       <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.199"
                parent="template.mavenWrapper">
                <property name="doNotModify" value="true" />
                <!-- <property name="doNotModifySources" value="true" /> -->
@@ -175,6 +175,7 @@
                <property name="doNotModify" value="true" />
        </bean>
 
+       <!-- Gson v2.8.6 requires Java 9 -->
        <bean id="com.google.gson"
                p:sourceCoords="com.google.code.gson:gson:jar:2.8.5"
                parent="template.mavenWrapper">
@@ -254,7 +255,7 @@
                </property>
        </bean>
        <bean id="org.eclipse.jgit"
-               p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r"
+               p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r"
                parent="template.mavenWrapper">
                <property name="doNotModify" value="true" />
                <property name="license">
@@ -372,7 +373,7 @@
        </bean>
 
        <bean id="org.postgresql.jdbc42"
-               p:sourceCoords="org.postgresql:postgresql:42.2.5"
+               p:sourceCoords="org.postgresql:postgresql:42.2.8"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant