From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 26 Sep 2018 11:58:20 +0000 (+0200)
Subject: Update versions and introduce POI (and XML dependencies)
X-Git-Tag: v2.3.9~60
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=859f548d8fdff7ff0171cd351836b256c4503cc1

Update versions and introduce POI (and XML dependencies)
---

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 0d22015..0933222 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Automatic-Module-Name: org.argeo.tp.factory.core
 Bundle-Description: OSGi packaging of free / open source third party lib
  raries
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -6,7 +7,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.argeo.tp.factory.core
-Bundle-Version: 2.1.20.r201801071243
+Bundle-Version: 2.1.21.SNAPSHOT-r201809250728
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi
  ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or
@@ -20,26 +21,26 @@ Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version
  g.springframework.beans.factory.config;version="[3.2,4)",org.springfram
  ework.core.io;version="[3.2,4)",javax.security.auth.callback;resolution
  :=optional
-Include-Resource: META-INF/spring/eclipse.rap.e4.xml=META-INF/spring/ecl
- ipse.rap.e4.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apac
- he.commons.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/apache
- .tomcat.xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.
- rcp.e4.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml,
- META-INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,M
- ETA-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-INF/s
- pring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/bouncycastle.xm
- l=META-INF/spring/bouncycastle.xml,META-INF/spring/spring.security.xml=
- META-INF/spring/spring.security.xml,META-INF/spring/javax.xml=META-INF/
- spring/javax.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META
- -INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF/
- spring/eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml,META-INF
- /spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/aether.xml=META
- -INF/spring/aether.xml,META-INF/spring/eclipse.jetty.xml=META-INF/sprin
- g/eclipse.jetty.xml,META-INF/spring/distribution.xml=META-INF/spring/di
- stribution.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,ME
- TA-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.x
- ml,META-INF/spring/apache.xml=META-INF/spring/apache.xml,META-INF/sprin
- g/eclipse.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml
+Include-Resource: META-INF/spring/misc.xml=META-INF/spring/misc.xml,META
+ -INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,META-
+ INF/spring/aether.xml=META-INF/spring/aether.xml,META-INF/spring/apache
+ .xml=META-INF/spring/apache.xml,META-INF/spring/eclipse.rap.e3.xml=META
+ -INF/spring/eclipse.rap.e3.xml,META-INF/spring/bouncycastle.xml=META-IN
+ F/spring/bouncycastle.xml,META-INF/spring/eclipse.rap.e4.xml=META-INF/s
+ pring/eclipse.rap.e4.xml,META-INF/spring/spring.security.xml=META-INF/s
+ pring/spring.security.xml,META-INF/spring/javax.xml=META-INF/spring/jav
+ ax.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spring/eclipse.jetty.
+ xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.rcp.e4.x
+ ml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/ap
+ ache.tomcat.xml=META-INF/spring/apache.tomcat.xml,META-INF/spring/apach
+ e.commons.xml=META-INF/spring/apache.commons.xml,META-INF/spring/sdk.xm
+ l=META-INF/spring/sdk.xml,META-INF/spring/apache.ant.xml=META-INF/sprin
+ g/apache.ant.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/
+ apache.jackrabbit.xml,META-INF/spring/templates.xml=META-INF/spring/tem
+ plates.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache.feli
+ x.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF/sp
+ ring/distribution.xml=META-INF/spring/distribution.xml,META-INF/spring/
+ eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml
 Private-Package: !*
 SLC-Category: org.argeo.tp.factory
 SLC-ExecutionModule: default
diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index cd4161d..4927233 100644
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -1,37 +1,57 @@
 <?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.commons.codec" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.codec"
+		spec="spec.commons">
 		<flow:arg name="project" value="codec" />
 		<flow:arg name="version" value="1.9" />
-		<bean p:version="@{version}.0" parent="template.commonsArchiveWrapper" />
+		<bean p:version="@{version}.0"
+			parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.dbcp" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.dbcp"
+		spec="spec.commons">
 		<flow:arg name="project" value="dbcp" />
 		<flow:arg name="version" value="1.4" />
-		<bean p:version="@{version}.0" parent="template.commonsArchiveWrapper" />
+		<bean p:version="@{version}.0"
+			parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.pool" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.pool"
+		spec="spec.commons">
 		<flow:arg name="project" value="pool" />
 		<flow:arg name="version" value="1.5.7" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.collections" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.collections"
+		spec="spec.commons">
 		<flow:arg name="project" value="collections" />
-		<flow:arg name="version" value="3.2.1" />
+		<flow:arg name="version" value="3.2.2" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.io" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.collections4"
+		spec="spec.commons">
+		<flow:arg name="project" value="collections4" />
+		<flow:arg name="version" value="4.2" />
+		<bean parent="template.commonsArchiveWrapper">
+			<property name="uri"
+				value="http://archive.apache.org/dist/commons/collections/binaries/commons-@{project}-@{version}-bin.zip" />
+		</bean>
+	</flow:flow>
+
+
+	<flow:flow name="apache/org.apache.commons.io"
+		spec="spec.commons">
 		<flow:arg name="project" value="io" />
 		<flow:arg name="version" value="2.6" />
 		<bean parent="template.commonsArchiveWrapper">
@@ -40,7 +60,8 @@
 				<map>
 					<entry
 						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.io" parent="template.org.apache.commons">
+						<bean id="org.apache.commons.io"
+							parent="template.org.apache.commons">
 							<property name="bndProperties">
 								<props merge="true">
 									<prop key="Export-Package">
@@ -55,13 +76,15 @@
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.exec" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.exec"
+		spec="spec.commons">
 		<flow:arg name="project" value="exec" />
 		<flow:arg name="version" value="1.3" />
 		<bean p:version="1.3.0" parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.jxpath" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.jxpath"
+		spec="spec.commons">
 		<flow:arg name="project" value="jxpath" />
 		<flow:arg name="version" value="1.3" />
 		<bean p:version="1.3.0" parent="template.commonsArchiveWrapper">
@@ -69,7 +92,8 @@
 				<map>
 					<entry
 						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.jxpath" parent="template.org.apache.commons">
+						<bean id="org.apache.commons.jxpath"
+							parent="template.org.apache.commons">
 							<property name="bndProperties">
 								<props merge="true">
 									<prop key="Import-Package">
@@ -87,26 +111,32 @@
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.net" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.net"
+		spec="spec.commons">
 		<flow:arg name="project" value="net" />
 		<flow:arg name="version" value="3.6" />
-		<bean p:version="@{version}.0" parent="template.commonsArchiveWrapper" />
+		<bean p:version="@{version}.0"
+			parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.compress" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.compress"
+		spec="spec.commons">
 		<flow:arg name="project" value="compress" />
-		<flow:arg name="version" value="1.15" />
-		<bean p:version="@{version}.0" parent="template.commonsArchiveWrapper">
+		<flow:arg name="version" value="1.18" />
+		<bean p:version="@{version}.0"
+			parent="template.commonsArchiveWrapper">
 			<property name="wrappers">
 				<map>
 					<entry
 						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-						<bean p:name="org.apache.commons.@{project}" parent="template.org.apache.commons">
+						<bean p:name="org.apache.commons.@{project}"
+							parent="template.org.apache.commons">
 							<property name="bndProperties">
 								<props merge="true">
 									<prop key="Import-Package">
 										org.brotli.*;resolution:=optional,
 										org.tukaani.*;resolution:=optional,
+										com.github.luben.zstd;resolution:=optional,
 										*
 									</prop>
 								</props>
@@ -127,7 +157,8 @@
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.vfs" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.vfs"
+		spec="spec.commons">
 		<flow:arg name="project" value="vfs" />
 		<flow:arg name="version" value="2.0" />
 		<bean parent="template.commonsArchiveWrapper">
@@ -136,8 +167,10 @@
 				value="http://archive.apache.org/dist/commons/vfs/binaries/commons-vfs-@{version}.zip" />
 			<property name="wrappers">
 				<map>
-					<entry key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar">
-						<bean id="org.apache.commons.vfs" parent="template.org.apache.commons">
+					<entry
+						key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar">
+						<bean id="org.apache.commons.vfs"
+							parent="template.org.apache.commons">
 							<property name="bndProperties">
 								<props merge="true">
 									<prop key="Import-Package">
@@ -154,7 +187,8 @@
 	</flow:flow>
 
 	<!-- VFS 2.2 Requires Collections v4 -->
-	<!-- <flow:flow name="apache/org.apache.commons.vfs" spec="spec.commons"> -->
+	<!-- <flow:flow name="apache/org.apache.commons.vfs" -->
+	<!-- spec="spec.commons"> -->
 	<!-- <flow:arg name="project" value="vfs" /> -->
 	<!-- <flow:arg name="version" value="2.2" /> -->
 	<!-- <bean parent="template.commonsArchiveWrapper"> -->
@@ -164,12 +198,15 @@
 		/> -->
 	<!-- <property name="wrappers"> -->
 	<!-- <map> -->
-	<!-- <entry key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar"> -->
-	<!-- <bean id="org.apache.commons.vfs" parent="template.org.apache.commons"> -->
+	<!-- <entry -->
+	<!-- key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar"> -->
+	<!-- <bean id="org.apache.commons.vfs" -->
+	<!-- parent="template.org.apache.commons"> -->
 	<!-- <property name="bndProperties"> -->
 	<!-- <props merge="true"> -->
 	<!-- <prop key="Import-Package"> -->
 	<!-- org.apache.tools.ant.*;resolution:=optional, -->
+	<!-- org.apache.commons.collections4.*;resolution:=optional, -->
 	<!-- * -->
 	<!-- </prop> -->
 	<!-- </props> -->
@@ -178,30 +215,42 @@
 	<!-- </entry> -->
 	<!-- </map> -->
 	<!-- </property> -->
-	<!-- <property name="sourcesProvider"> -->
-	<!-- <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
-	<!-- <property name="uri" -->
-	<!-- value="http://archive.apache.org/dist/commons/@{project}/source/commons-vfs2-distribution-@{version}-src.zip" 
-		/> -->
-	<!-- <property name="base" -->
-	<!-- value="commons-@{project}-@{version}-src/src/main/java/" /> -->
-	<!-- <property name="osgiFactory" ref="osgiFactory" /> -->
-	<!-- </bean> -->
-	<!-- </property> -->
 	<!-- </bean> -->
 	<!-- </flow:flow> -->
 
-	<flow:flow name="apache/org.apache.commons.fileupload" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.math3"
+		spec="spec.commons">
+		<flow:arg name="project" value="math3" />
+		<flow:arg name="version" value="3.6.1" />
+		<bean parent="template.commonsArchiveWrapper">
+			<property name="version" value="@{version}" />
+			<property name="uri"
+				value="http://archive.apache.org/dist/commons/math/binaries/commons-@{project}-@{version}-bin.zip" />
+			<property name="wrappers">
+				<map>
+					<entry
+						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+						<bean id="org.apache.commons.math3"
+							parent="template.org.apache.commons" />
+					</entry>
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<flow:flow name="apache/org.apache.commons.fileupload"
+		spec="spec.commons">
 		<flow:arg name="project" value="fileupload" />
-		<flow:arg name="version" value="1.3.1" />
+		<flow:arg name="version" value="1.3.3" />
 		<bean parent="template.commonsArchiveWrapper">
 			<property name="uri"
 				value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
 			<property name="wrappers">
 				<map>
 					<entry
-						key="commons-@{project}-@{version}-bin/lib/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons">
+						key="commons-@{project}-@{version}-bin/commons-@{project}-@{version}.jar">
+						<bean id="org.apache.commons.fileupload"
+							parent="template.org.apache.commons">
 							<property name="bndProperties">
 								<props merge="true">
 									<prop key="Import-Package">
@@ -226,7 +275,8 @@
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.jci" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.jci"
+		spec="spec.commons">
 		<flow:arg name="project" value="jci" />
 		<flow:arg name="version" value="1.1" />
 		<bean parent="template.commonsArchiveWrapper">
@@ -238,7 +288,8 @@
 				<map>
 					<entry
 						key="commons-@{project}-@{version}/lib/commons-@{project}-core-@{version}.jar">
-						<bean p:name="org.apache.commons.@{project}-core" parent="template.org.apache.commons">
+						<bean p:name="org.apache.commons.@{project}-core"
+							parent="template.org.apache.commons">
 							<property name="bndProperties">
 								<props merge="true">
 									<prop key="Import-Package">
@@ -251,7 +302,8 @@
 					</entry>
 					<entry
 						key="commons-@{project}-@{version}/lib/commons-@{project}-eclipse-@{version}.jar">
-						<bean p:name="org.apache.commons.@{project}-eclipse" parent="template.org.apache.commons" />
+						<bean p:name="org.apache.commons.@{project}-eclipse"
+							parent="template.org.apache.commons" />
 					</entry>
 					<!-- <entry -->
 					<!-- key="commons-@{project}-@{version}/lib/commons-@{project}-rhino-@{version}.jar"> -->
@@ -273,7 +325,8 @@
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.httpclient" spec="spec.version">
+	<flow:flow name="apache/org.apache.commons.httpclient"
+		spec="spec.version">
 		<flow:arg name="version" value="3.1" />
 		<bean parent="template.commonsArchiveWrapper">
 			<property name="version" value="@{version}.0" />
@@ -283,7 +336,8 @@
 				<map>
 					<entry
 						key="commons-httpclient-@{version}/commons-httpclient-@{version}.jar">
-						<bean id="org.apache.commons.httpclient" parent="template.org.apache.commons" />
+						<bean id="org.apache.commons.httpclient"
+							parent="template.org.apache.commons" />
 					</entry>
 				</map>
 			</property>
@@ -291,25 +345,28 @@
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
 					<property name="uri"
 						value="http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-@{version}-src.zip" />
-					<property name="base" value="commons-httpclient-@{version}/src/java/" />
+					<property name="base"
+						value="commons-httpclient-@{version}/src/java/" />
 					<property name="osgiFactory" ref="osgiFactory" />
 				</bean>
 			</property>
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.lang3" spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.lang3"
+		spec="spec.commons">
 		<flow:arg name="project" value="lang3" />
-		<flow:arg name="version" value="3.4" />
+		<flow:arg name="version" value="3.8.1" />
 		<bean parent="template.commonsArchiveWrapper">
-			<property name="version" value="@{version}.0" />
+			<property name="version" value="@{version}" />
 			<property name="uri"
 				value="http://archive.apache.org/dist/commons/lang/binaries/commons-@{project}-@{version}-bin.zip" />
 			<property name="wrappers">
 				<map>
 					<entry
 						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.lang3" parent="template.org.apache.commons" />
+						<bean id="org.apache.commons.lang3"
+							parent="template.org.apache.commons" />
 					</entry>
 				</map>
 			</property>
@@ -331,11 +388,12 @@
 		<flow:primitive name="project" isParameter="true" />
 	</flow:spec>
 
-	<bean id="template.commonsArchiveWrapper" parent="template.archiveWrapper"
-		abstract="true">
+	<bean id="template.commonsArchiveWrapper"
+		parent="template.archiveWrapper" abstract="true">
 		<property name="version" value="@{version}" />
 		<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="uri"
 			value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
@@ -343,14 +401,15 @@
 			<map>
 				<entry
 					key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-					<bean p:name="org.apache.commons.@{project}" parent="template.org.apache.commons" />
+					<bean p:name="org.apache.commons.@{project}"
+						parent="template.org.apache.commons" />
 				</entry>
 			</map>
 		</property>
 	</bean>
 
-	<bean id="template.org.apache.commons" parent="template.bndWrapper"
-		abstract="true">
+	<bean id="template.org.apache.commons"
+		parent="template.bndWrapper" abstract="true">
 		<property name="groupId" value="org.argeo.tp.apache.commons" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 8f4ca80..4c8d342 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.16.0" />
+		<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"
diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 97d02c3..7bb6573 100644
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -1,20 +1,24 @@
 <?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.lucene" spec="spec.version">
+	<flow:flow name="apache/org.apache.lucene"
+		spec="spec.version">
 		<flow:arg name="version" value="3.6.2" />
 		<bean id="org.apache.lucene" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.lucene:lucene-core:@{version}" />
+			p:version="@{version}"
+			p:sourceCoords="org.apache.lucene:lucene-core:@{version}" />
 	</flow:flow>
 
 	<flow:flow name="apache/org.apache.tika" spec="spec.version">
-		<flow:arg name="version" value="1.16" />
+		<flow:arg name="version" value="1.19" />
 		<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"
@@ -38,12 +42,14 @@
 		</property>
 	</bean>
 
-	<bean id="org.apache.mina.core" p:sourceCoords="org.apache.mina:mina-core:2.0.16"
+	<bean id="org.apache.mina.core"
+		p:sourceCoords="org.apache.mina:mina-core:2.0.19"
 		parent="template.apacheMaven">
 		<property name="doNotModify" value="true" />
 	</bean>
-	
-	<bean id="org.apache.sshd.core" p:sourceCoords="org.apache.sshd:sshd-core:1.6.0"
+
+	<bean id="org.apache.sshd.core"
+		p:sourceCoords="org.apache.sshd:sshd-core:2.0.0"
 		parent="template.apacheMaven">
 		<property name="doNotModify" value="true" />
 	</bean>
@@ -55,7 +61,8 @@
 			<property name="uri"
 				value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
 			<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="wrappers">
 				<map>
@@ -67,47 +74,133 @@
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
 					<property name="uri"
 						value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-					<property name="base" value="apache-log4j-@{version}/src/main/java/" />
+					<property name="base"
+						value="apache-log4j-@{version}/src/main/java/" />
 					<property name="osgiFactory" ref="osgiFactory" />
 				</bean>
 			</property>
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.pdfbox" spec="spec.version">
+	<flow:flow name="apache/org.apache.pdfbox"
+		spec="spec.version">
 		<flow:arg name="version" value="2.0.3" />
 		<bean id="org.apache.pdfbox" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
-		<bean id="org.apache.pdfbox.fontbox" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.pdfbox:fontbox:@{version}" />
+			p:version="@{version}"
+			p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
+		<bean id="org.apache.pdfbox.fontbox"
+			parent="template.apacheMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.pdfbox:fontbox:@{version}" />
 	</flow:flow>
 
+	<flow:flow name="apache/org.apache.poi" spec="spec.version">
+		<flow:arg name="version" value="4.0.0" />
+		<bean id="org.apache.poi" parent="template.apacheMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.poi:poi:@{version}" />
+		<bean id="org.apache.poi.ooxml" parent="template.apacheMaven"
+			p:version="@{version}"
+			p:sourceCoords="org.apache.poi:poi-ooxml:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Import-Package">
+						com.graphbuilder.*;resolution:=optional,
+						org.etsi.uri.*;resolution:=optional,
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
+
+		<bean id="org.apache.poi.ooxml.schemas"
+			parent="template.apacheMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.poi:poi-ooxml-schemas:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Import-Package">
+						com.microsoft.schemas.*;resolution:=optional,
+						org.openxmlformats.schemas.*;resolution:=optional,
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
+		<bean id="org.apache.poi.scratchpad"
+			parent="template.apacheMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.poi:poi-scratchpad:@{version}" />
+	</flow:flow>
+
+	<bean id="org.apache.xmlbeans"
+		p:sourceCoords="org.apache.xmlbeans:xmlbeans:3.0.1"
+		parent="template.apacheMaven">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.sun.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.apache.xalan" p:sourceCoords="xalan:xalan:2.7.2"
+		parent="template.apacheMaven" />
+	<bean id="org.apache.xalan.serializer"
+		p:sourceCoords="xalan:serializer:2.7.2" parent="template.apacheMaven" />
+
+	<bean id="org.apache.xerces"
+		p:sourceCoords="xerces:xercesImpl:2.12.0"
+		parent="template.apacheMaven">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					sun.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.apache.xml.resolver"
+		p:sourceCoords="xml-resolver:xml-resolver:1.2"
+		parent="template.apacheMaven" />
+
+	<bean id="org.apache.xml.security"
+		p:sourceCoords="org.apache.santuario:xmlsec:2.1.2"
+		parent="template.apacheMaven" />
+
 	<flow:flow name="apache/org.apache.batik" spec="spec.version">
-		<flow:arg name="version" value="1.9.1" />
+		<flow:arg name="version" value="1.10" />
 		<!-- <bean id="org.apache.batik.ext" parent="template.apacheMaven" -->
 		<!-- p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-ext:jar:@{version}" 
 			/> -->
 		<bean id="org.apache.batik.i18n" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
+			p:version="@{version}.0"
+			p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
 		<bean id="org.apache.batik.util" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-util:jar:@{version}" />
+			p:version="@{version}.0"
+			p:sourceCoords="org.apache.xmlgraphics:batik-util:jar:@{version}" />
 		<bean id="org.apache.batik.css" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
+			p:version="@{version}.0"
+			p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.xmlgraphics" spec="spec.version">
-		<flow:arg name="version" value="2.2.0" />
-		<bean id="org.apache.xmlgraphics.commons" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:2.2" />
+	<flow:flow name="apache/org.apache.xmlgraphics"
+		spec="spec.version">
+		<flow:arg name="version" value="2.3" />
+		<bean id="org.apache.xmlgraphics.commons"
+			parent="template.apacheMaven" p:version="@{version}.0"
+			p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:@{version}" />
 	</flow:flow>
 
+
 	<flow:flow name="apache/org.apache.httpcomponents.httpclient"
 		spec="spec.version">
-		<flow:arg name="version" value="4.5.4" />
+		<flow:arg name="version" value="4.5.6" />
 		<bean parent="template.archiveWrapper">
 			<property name="version" value="@{version}" />
 			<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="uri"
 				value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
@@ -132,11 +225,12 @@
 
 	<flow:flow name="apache/org.apache.httpcomponents.httpcore"
 		spec="spec.version">
-		<flow:arg name="version" value="4.4.8" />
+		<flow:arg name="version" value="4.4.10" />
 		<bean parent="template.archiveWrapper">
 			<property name="version" value="@{version}" />
 			<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="uri"
 				value="http://archive.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-@{version}-osgi-bin.zip" />
@@ -165,7 +259,8 @@
 		abstract="true">
 		<property name="groupId" value="org.argeo.tp.apache" />
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
 
@@ -174,7 +269,8 @@
 		<property name="version" value="@{version}.0" />
 		<property name="doNotModify" value="true" />
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
index 5c8de9b..840ac58 100644
--- a/META-INF/spring/bouncycastle.xml
+++ b/META-INF/spring/bouncycastle.xml
@@ -11,9 +11,9 @@
 
 	<!-- REGISTER -->
 	<flow:flow name="misc/org.bouncycastle" spec="spec.version">
-		<flow:arg name="version" value="1.59" />
+		<flow:arg name="version" value="1.60" />
 		<bean id="bcprov"
-			p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-159.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-160.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -24,7 +24,7 @@
 			</property>
 		</bean>
 		<bean id="bcpkix"
-			p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-159.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-160.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -35,7 +35,7 @@
 			</property>
 		</bean>
 		<bean id="bcmail"
-			p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-159.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-160.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -46,7 +46,7 @@
 			</property>
 		</bean>
 		<bean id="bcpg"
-			p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-159.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-160.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 48887fc..a1e9548 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -1,16 +1,20 @@
 <?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">
 
 	<!-- REGISTER -->
-	<bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+	<bean id="argeo-tp"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
-		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.20" />
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp:2.1.21-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<!-- Javax -->
@@ -57,6 +61,7 @@
 				<ref bean="apache/org.apache.commons.io" />
 				<ref bean="apache/org.apache.commons.fileupload" />
 				<ref bean="apache/org.apache.commons.collections" />
+				<ref bean="apache/org.apache.commons.collections4" />
 				<ref bean="apache/org.apache.commons.dbcp" />
 				<ref bean="apache/org.apache.commons.pool" />
 				<ref bean="apache/org.apache.commons.codec" />
@@ -64,6 +69,7 @@
 				<ref bean="apache/org.apache.commons.vfs" />
 				<ref bean="apache/org.apache.commons.net" />
 				<ref bean="apache/org.apache.commons.exec" />
+				<ref bean="apache/org.apache.commons.math3" />
 				<!-- <ref bean="apache/org.apache.commons.jxpath" /> -->
 				<!-- <ref bean="apache/org.apache.commons.jci" /> -->
 				<ref bean="apache/org.apache.commons.compress" />
@@ -92,6 +98,13 @@
 				<!-- Document generation and management -->
 				<ref bean="net.sf.jxl" />
 				<ref bean="apache/org.apache.pdfbox" />
+				<ref bean="org.apache.xml.security" />
+				<ref bean="org.apache.xmlbeans" />
+				<ref bean="org.apache.xalan" />
+				<ref bean="org.apache.xalan.serializer" />
+				<ref bean="org.apache.xml.resolver" />
+				<ref bean="org.apache.xerces" />
+				<ref bean="apache/org.apache.poi" />
 				<!-- Databases -->
 				<ref bean="org.postgresql.jdbc42" />
 				<ref bean="org.h2" />
@@ -104,9 +117,11 @@
 		</property>
 	</bean>
 
-	<bean id="argeo-tp-rap-e4" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+	<bean id="argeo-tp-rap-e4"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
-		<constructor-arg value="org.argeo.tp:argeo-tp-rap-e4:2.1.20" />
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp-rap-e4:2.1.21-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -114,9 +129,11 @@
 		</property>
 	</bean>
 
-	<bean id="argeo-tp-rcp-e4" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+	<bean id="argeo-tp-rcp-e4"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
-		<constructor-arg value="org.argeo.tp:argeo-tp-rcp-e4:2.1.20" />
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp-rcp-e4:2.1.21-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -124,9 +141,11 @@
 		</property>
 	</bean>
 
-	<bean id="argeo-tp-rap-e3" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+	<bean id="argeo-tp-rap-e3"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
-		<constructor-arg value="org.argeo.tp:argeo-tp-rap-e3:2.1.20" />
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp-rap-e3:2.1.21-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.platform" />
@@ -135,8 +154,9 @@
 	</bean>
 
 	<!-- Factory -->
-	<bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
-		init-method="init" destroy-method="destroy">
+	<bean id="osgiFactory"
+		class="org.argeo.slc.repo.osgi.OsgiFactoryImpl" init-method="init"
+		destroy-method="destroy">
 		<property name="workspace" value="argeo-2.1" />
 		<property name="nodeIndexers">
 			<list>
diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index d74d8cf..32648af 100644
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -8,8 +8,8 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<flow:flow name="eclipse/org.argeo.tp.equinox" parent="template.importEquinox">
-		<flow:arg name="equinoxRelease" value="Oxygen.2" />
-		<flow:arg name="equinoxTimestamp" value="201711300510" />
+		<flow:arg name="equinoxRelease" value="4.9" />
+		<flow:arg name="equinoxTimestamp" value="201809060745" />
 	</flow:flow>
 
 	<!-- Equinox specs and templates -->
diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index e0d4ed0..d1b48f3 100644
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -8,7 +8,7 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<flow:flow name="eclipse/org.argeo.tp.jetty" parent="template.importJettyZip">
-		<flow:arg name="jettyVersion" value="9.4.8.v20171121" />
+		<flow:arg name="jettyVersion" value="9.4.12.v20180830" />
 	</flow:flow>
 
 	<!-- Jetty specs and templates -->
diff --git a/META-INF/spring/eclipse.rap.e3.xml b/META-INF/spring/eclipse.rap.e3.xml
index b0ded12..f36f672 100644
--- a/META-INF/spring/eclipse.rap.e3.xml
+++ b/META-INF/spring/eclipse.rap.e3.xml
@@ -9,8 +9,8 @@
 
 	<!-- Eclipse rap platform -->
 	<flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
-		<flow:arg name="rapRelease" value="3.4" />
-		<flow:arg name="rapTimestamp" value="3.4.0-R-20171204-1637" />
+		<flow:arg name="rapRelease" value="3.6" />
+		<flow:arg name="rapTimestamp" value="3.6.0-R-20180912-1017" />
 	</flow:flow>
 
 	<!-- Rap specs and templates -->
@@ -48,7 +48,7 @@
 					<entry key="plugins/org.eclipse.help*.jar" value="org.argeo.tp.rap.platform" />
 
 					<!-- Misc -->
-					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/com.ibm.icu*.jar" value="org.argeo.tp.rap.platform" />
 				</map>
 			</property>
 			<property name="osgiFactory" ref="osgiFactory" />
diff --git a/META-INF/spring/eclipse.rap.e4.xml b/META-INF/spring/eclipse.rap.e4.xml
index 282a6ab..954742c 100644
--- a/META-INF/spring/eclipse.rap.e4.xml
+++ b/META-INF/spring/eclipse.rap.e4.xml
@@ -9,8 +9,8 @@
 
 	<!-- Eclipse rap platform -->
 	<flow:flow name="eclipse/org.argeo.tp.rap.e4" parent="template.importRapE4">
-		<flow:arg name="rapRelease" value="3.4" />
-		<flow:arg name="rapTimestamp" value="3.4.0-R-20171204-1637" />
+		<flow:arg name="rapRelease" value="3.6" />
+		<flow:arg name="rapTimestamp" value="3.6.0-R-20180912-1017" />
 	</flow:flow>
 
 	<!-- Rap specs and templates -->
@@ -59,9 +59,12 @@
 					<entry key="plugins/org.eclipse.rap.jface*.jar" value="org.argeo.tp.rap.e4" />
 					<entry key="plugins/org.eclipse.rap.ui.forms*.jar" value="org.argeo.tp.rap.e4" />
 					<entry key="plugins/org.eclipse.help*.jar" value="org.argeo.tp.rap.e4" />
+					
+					<!-- Nebula -->
+					<entry key="plugins/org.eclipse.rap.nebula.*.jar" value="org.argeo.tp.rap.e4" />
 
 					<!-- Misc -->
-					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.e4" />
+					<entry key="plugins/com.ibm.icu*.jar" value="org.argeo.tp.rap.e4" />
 				</map>
 			</property>
 			<property name="osgiFactory" ref="osgiFactory" />
diff --git a/META-INF/spring/eclipse.rcp.e4.xml b/META-INF/spring/eclipse.rcp.e4.xml
index d149bf4..eac7885 100644
--- a/META-INF/spring/eclipse.rcp.e4.xml
+++ b/META-INF/spring/eclipse.rcp.e4.xml
@@ -1,16 +1,18 @@
 <?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-0.12.xsd">
 
-	<!-- RCP 3.8 -->
-	<flow:flow name="eclipse/org.argeo.tp.rcp.e4" parent="template.eclipseRcp">
-		<flow:arg name="version" value="4.7.2" />
-		<flow:arg name="release" value="R-4.7.2-201711300510" />
+	<flow:flow name="eclipse/org.argeo.tp.rcp.e4"
+		parent="template.eclipseRcp">
+		<flow:arg name="version" value="4.9" />
+		<flow:arg name="release" value="R-4.9-201809060745" />
 	</flow:flow>
 
 	<!-- RAP specs and templates -->
diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 24ac8d0..3f439f7 100644
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -1,30 +1,37 @@
 <?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">
 
-	<bean id="javax.inject" p:version="1.0.0" p:sourceCoords="javax.inject:javax.inject:1"
+	<bean id="javax.inject" p:version="1.0.0"
+		p:sourceCoords="javax.inject:javax.inject:1"
 		parent="template.mavenJavax">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
 
-	<bean id="javax.jcr" p:version="2.0.0" p:sourceCoords="javax.jcr:jcr:2.0"
-		parent="template.mavenJavax">
+	<bean id="javax.jcr" p:version="2.0.0"
+		p:sourceCoords="javax.jcr:jcr:2.0" parent="template.mavenJavax">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
 
-	<bean id="javax.transaction" p:version="1.1.0" p:sourceCoords="javax.transaction:jta:1.1"
+	<bean id="javax.transaction" p:version="1.1.0"
+		p:sourceCoords="javax.transaction:jta:1.1"
 		parent="template.mavenJavax">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -33,19 +40,33 @@
 		</property>
 	</bean>
 
-	<bean id="javax.mail" p:sourceCoords="com.sun.mail:javax.mail:1.5.2"
+	<!-- Javax transaction 1.3 has dependencies -->
+	<!-- <bean id="javax.transaction-api" p:version="1.3" -->
+	<!-- p:sourceCoords="javax.transaction:javax.transaction-api:1.3" -->
+	<!-- parent="template.mavenJavax"> -->
+	<!-- <property name="license"> -->
+	<!-- <util:constant -->
+	<!-- static-field="org.argeo.slc.repo.FreeLicense.CDDL" /> -->
+	<!-- </property> -->
+	<!-- <property name="doNotModify" value="true" /> -->
+	<!-- </bean> -->
+
+	<bean id="javax.mail"
+		p:sourceCoords="com.sun.mail:javax.mail:1.6.2"
 		parent="template.mavenJavax">
 		<property name="license">
-			<!-- GPL with classpath exception -->
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
 		</property>
 	</bean>
 
-	<bean id="javax.annotation" p:version="1.2.0" p:sourceCoords="javax.annotation:javax.annotation-api:1.2"
+	<bean id="javax.annotation" p:version="1.2.0"
+		p:sourceCoords="javax.annotation:javax.annotation-api:1.2"
 		parent="template.mavenJavax">
 		<property name="license">
 			<!-- GPL with classpath exception -->
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.GPL" />
 		</property>
 	</bean>
 
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 5b72635..6f4e798 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -28,7 +28,7 @@
 		</property>
 	</bean>
 
-	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.195"
+	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.197"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
 		<!-- <property name="doNotModifySources" value="true" /> -->
@@ -136,15 +136,16 @@
 		</property>
 	</bean>
 
-	<bean id="com.google.guava" p:sourceCoords="com.google.guava:guava:jar:23.0"
+	<bean id="com.google.guava" p:sourceCoords="com.google.guava:guava:jar:26.0-jre"
 		parent="template.mavenWrapper">
+		<property name="version" value="26.0.0" />
 		<property name="license">
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="doNotModify" value="true" />
 	</bean>
 
-	<bean id="com.google.gson" p:sourceCoords="com.google.code.gson:gson:jar:2.8.1"
+	<bean id="com.google.gson" p:sourceCoords="com.google.code.gson:gson:jar:2.8.5"
 		parent="template.mavenWrapper">
 		<property name="license">
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
@@ -216,7 +217,7 @@
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
-	<bean id="org.eclipse.jgit" p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:4.8.0.201706111038-r"
+	<bean id="org.eclipse.jgit" p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
 		<property name="license">
@@ -253,7 +254,7 @@
 		</property>
 	</bean>
 
-	<bean id="org.postgresql.jdbc42" p:sourceCoords="org.postgresql:postgresql:42.1.4"
+	<bean id="org.postgresql.jdbc42" p:sourceCoords="org.postgresql:postgresql:42.2.5"
 		parent="template.mavenWrapper">
 		<property name="license">
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
diff --git a/pom.xml b/pom.xml
index 206a9ed..7482111 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>lib</artifactId>
-		<version>2.1.10</version>
+		<version>2.1.14</version>
 	</parent>
 	<groupId>org.argeo.tp.factory</groupId>
 	<artifactId>org.argeo.tp.factory.core</artifactId>
-	<version>2.1.20</version>
+	<version>2.1.21-SNAPSHOT</version>
 	<name>Argeo Third Party Factory</name>
 	<description>OSGi packaging of free / open source third party libraries</description>
 	<properties>
@@ -60,6 +61,11 @@
 			<version>${version.slc}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>