From 97a4a987238f571bb5c55c46c2afccc4c0da99b6 Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Sat, 7 Feb 2015 19:31:33 +0100
Subject: [PATCH] Argeo TP v2.1.6

---
 META-INF/MANIFEST.MF                |  4 +-
 META-INF/spring/apache.commons.xml  | 47 ++++++++++-----
 META-INF/spring/distribution.xml    | 37 ++++++------
 META-INF/spring/eclipse.equinox.xml | 47 +++++++++++----
 META-INF/spring/eclipse.ide.xml     |  2 +-
 META-INF/spring/eclipse.jetty.xml   | 15 -----
 META-INF/spring/eclipse.rap.xml     | 54 ++++--------------
 META-INF/spring/javax.xml           | 30 +++++++---
 META-INF/spring/misc.xml            | 88 +++++++++++++----------------
 META-INF/spring/spring.security.xml |  4 --
 META-INF/spring/spring.xml          |  1 +
 META-INF/spring/templates.xml       |  4 +-
 pom.xml                             |  2 +-
 13 files changed, 164 insertions(+), 171 deletions(-)

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 946a85d..7566100 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1423312745289
+Bnd-LastModified: 1423333991281
 Build-Jdk: 1.7.0_75
 Built-By: mbaudier
 Bundle-Description: SLC execution modules for generic tasks, to be used 
@@ -11,7 +11,7 @@ Bundle-Name: Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-SymbolicName: org.argeo.tp.factory.core
 Bundle-Vendor: Argeo
-Bundle-Version: 1.1.19.r150207_1338
+Bundle-Version: 1.1.20.r150207_1933
 Created-By: Apache Maven Bundle Plugin
 Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback
  ;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.
diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index dd96fb2..d73d3cc 100644
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -34,15 +34,33 @@
 	<flow:flow name="apache/org.apache.commons.io" spec="spec.commons">
 		<flow:arg name="project" value="io" />
 		<flow:arg name="version" value="2.4" />
-		<bean p:version="2.4.0" parent="template.commonsArchiveWrapper" />
+		<bean parent="template.commonsArchiveWrapper">
+			<property name="version" value="@{version}.0" />
+			<property name="wrappers">
+				<map>
+					<entry
+						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+						<bean id="org.apache.commons.io" parent="template.org.apache.commons">
+							<property name="bndProperties">
+								<props merge="true">
+									<prop key="Export-Package">
+										org.apache.commons.io.*;version="2.4"
+									</prop>
+								</props>
+							</property>
+						</bean>
+					</entry>
+				</map>
+			</property>
+		</bean>
 	</flow:flow>
-	
+
 	<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>
+
 	<flow:flow name="apache/org.apache.commons.net" spec="spec.commons">
 		<flow:arg name="project" value="net" />
 		<flow:arg name="version" value="3.3" />
@@ -59,20 +77,19 @@
 			<property name="wrappers">
 				<map>
 					<entry key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar">
-						<bean id="org.apache.commons.vfs" parent="template.org.apache.commons" />
+						<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,
+										*
+									</prop>
+								</props>
+							</property>
+						</bean>
 					</entry>
 				</map>
 			</property>
-			<!-- <property name="sourcesProvider"> -->
-			<!-- <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="osgiFactory" ref="osgiFactory" /> -->
-			<!-- </bean> -->
-			<!-- </property> -->
 		</bean>
 	</flow:flow>
 
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index df8af78..74c6394 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,6 +13,12 @@
 		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.6" />
 		<property name="modules">
 			<list>
+				<!-- Javax -->
+				<ref bean="javax.inject" />
+				<ref bean="javax.jcr" />
+				<ref bean="javax.mail" />
+
+				<!-- Standalone projects -->
 				<ref bean="apache/org.apache.log4j" />
 				<ref bean="misc/org.slf4j" />
 				<ref bean="org.aopalliance" />
@@ -21,16 +27,12 @@
 				<ref bean="org.joda.time" />
 				<ref bean="com.jcraft.jsch" />
 				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
-				<ref bean="javax.el" />
-				<ref bean="javax.inject" />
-				<ref bean="javax.jcr" />
-				<ref bean="javax.mail" />
-				<ref bean="misc/org.aspectj" />
+				<ref bean="org.objectweb.asm" />
+				<ref bean="org.aspectj.weaver" />
 				<ref bean="misc/org.bouncycastle" />
-				<ref bean="spring/org.springframework" />
-				<ref bean="org.springframework.ldap" />
-				<ref bean="spring/org.springframework.security" />
 				<ref bean="apache/org.apache.ant" />
+
+				<!-- Apache Commons -->
 				<ref bean="apache/org.apache.commons.io" />
 				<ref bean="apache/org.apache.commons.fileupload" />
 				<ref bean="apache/org.apache.commons.collections" />
@@ -41,30 +43,25 @@
 				<ref bean="apache/org.apache.commons.vfs" />
 				<ref bean="apache/org.apache.commons.net" />
 				<ref bean="apache/org.apache.commons.exec" />
-				<!-- Felix -->
-				<!-- <ref bean="org.apache.felix.framework" /> -->
-				<!-- <ref bean="org.apache.felix.bundlerepository" /> -->
-				<!-- <ref bean="org.apache.felix.gogo.command" /> -->
-				<!-- <ref bean="org.apache.felix.gogo.runtime" /> -->
-				<!-- <ref bean="org.apache.felix.gogo.shell" /> -->
+
 				<!-- Eclipse -->
 				<ref bean="eclipse/org.argeo.tp.jetty" />
 				<ref bean="eclipse/org.argeo.tp.equinox" />
 				<ref bean="eclipse/org.argeo.tp.gemini" />
 
-				<!-- Rap -->
+				<!-- Eclipse RAP -->
 				<ref bean="eclipse/org.argeo.tp.rap.platform" />
 				<ref bean="eclipse/org.argeo.tp.rap.addons" />
-				<!-- <ref bean="eclipse/org.argeo.tp.rap.addons.fileupload" /> -->
 
-				<!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
-				<!-- <ref bean="org.eclipse.gemini.web.core" /> -->
-				<!-- <ref bean="org.eclipse.gemini.web.extender" /> -->
-				<!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
 				<!-- Jackrabbit -->
 				<ref bean="apache/org.apache.tika" />
 				<ref bean="apache/org.apache.lucene" />
 				<ref bean="apache/org.apache.jackrabbit" />
+				
+				<!-- Spring -->
+				<ref bean="spring/org.springframework" />
+				<ref bean="org.springframework.ldap" />
+				<ref bean="spring/org.springframework.security" />
 			</list>
 		</property>
 	</bean>
diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 6e42b38..b5baaaa 100644
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -7,16 +7,13 @@
 	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">
 
-	<!-- Equinox Kepler SR2 (3.9.1) -->
 	<flow:flow name="eclipse/org.argeo.tp.equinox" parent="template.importEquinox">
-		<!-- <flow:arg name="version" value="3.9.1" /> -->
-		<flow:arg name="equinoxRelease" value="KeplerSR2" />
-		<flow:arg name="equinoxTimestamp" value="201402211700" />
+		<flow:arg name="equinoxRelease" value="LunaSR1" />
+		<flow:arg name="equinoxTimestamp" value="201409250400" />
 	</flow:flow>
 
 	<!-- Equinox specs and templates -->
 	<flow:spec id="equinoxVersion.spec">
-		<!-- <flow:primitive name="version" isParameter="true" /> -->
 		<flow:primitive name="equinoxRelease" isParameter="true" />
 		<flow:primitive name="equinoxTimestamp" isParameter="true" />
 	</flow:spec>
@@ -28,15 +25,43 @@
 				value="http://www.eclipse.org/downloads/equinox/drops/R-@{equinoxRelease}-@{equinoxTimestamp}/equinox-SDK-@{equinoxRelease}.zip" />
 			<property name="includes">
 				<map>
+					<!-- Core OSGi framework -->
 					<entry key="plugins/org.eclipse.osgi_*.jar" value="org.argeo.tp.equinox" />
-					<entry key="plugins/org.eclipse.osgi.*.jar" value="org.argeo.tp.equinox" />
-					<!-- FIXME move it to RAP or Addons, only used for build -->
-					<entry key="plugins/org.eclipse.equinox.security_*.jar"
+					<entry key="plugins/org.eclipse.osgi.source_*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.osgi.util*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.osgi.services*.jar" value="org.argeo.tp.equinox" />
+
+					<!-- Javax -->
+					<entry key="plugins/javax.servlet_*.jar" value="org.argeo.tp.javax" />
+					<entry key="plugins/javax.servlet.source_*.jar" value="org.argeo.tp.javax" />
+					<entry key="plugins/javax.el*.jar" value="org.argeo.tp.javax" />
+
+					<!-- Felix console -->
+					<entry key="plugins/org.apache.felix.gogo.*.jar" value="org.argeo.tp.apache.felix" />
+
+					<!-- Required by RAP -->
+					<entry key="plugins/org.eclipse.equinox.app*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.cm*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.common*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.console_*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.console.source_*.jar"
+						value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.ds*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.event*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.http.jetty*.jar"
+						value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.http.registry*.jar"
+						value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.http.servlet*.jar"
+						value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.http.servletbridge*.jar"
+						value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.preferences*.jar"
 						value="org.argeo.tp.equinox" />
-					<entry key="plugins/org.eclipse.equinox.security.source_*.jar"
+					<entry key="plugins/org.eclipse.equinox.registry*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.servletbridge*.jar"
 						value="org.argeo.tp.equinox" />
-					<!-- <entry key="plugins/org.eclipse.core.*.jar" -->
-					<!-- value="org.argeo.tp.equinox" /> -->
+					<entry key="plugins/org.eclipse.equinox.util*.jar" value="org.argeo.tp.equinox" />
 				</map>
 			</property>
 			<property name="osgiFactory" ref="osgiFactory" />
diff --git a/META-INF/spring/eclipse.ide.xml b/META-INF/spring/eclipse.ide.xml
index 08c4866..6eed4c5 100644
--- a/META-INF/spring/eclipse.ide.xml
+++ b/META-INF/spring/eclipse.ide.xml
@@ -8,7 +8,7 @@
 	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.eclipse.ide_3.8.2"
+	<flow:flow name="eclipse/org.argeo.tp.eclipse.ide"
 		parent="template.eclipseIde">
 		<flow:arg name="version" value="3.8.2" />
 		<flow:arg name="release" value="R-3.8.2-201301310800" />
diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index aab369a..1fdd627 100644
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -47,21 +47,6 @@
 						value="org.argeo.tp.jetty" />
 					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
 						value="org.argeo.tp.jetty" />
-					<!-- Javax -->
-					<entry key="jetty-distribution-@{jettyVersion}/lib/servlet-api-*.jar"
-						value="org.argeo.tp.javax" />
-					<entry
-						key="jetty-distribution-@{jettyVersion}/lib/annotations/javax.annotation-*.jar"
-						value="org.argeo.tp.javax" />
-					<entry
-						key="jetty-distribution-@{jettyVersion}/lib/annotations/org.objectweb.asm-*.jar"
-						value="org.argeo.tp" />
-					<entry
-						key="jetty-distribution-@{jettyVersion}/lib/jndi/javax.activation-*.jar"
-						value="org.argeo.tp.javax" />
-					<entry
-						key="jetty-distribution-@{jettyVersion}/lib/jta/javax.transaction-*.jar"
-						value="org.argeo.tp.javax" />
 				</map>
 			</property>
 			<property name="excludes">
diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index 068d67b..b965613 100644
--- a/META-INF/spring/eclipse.rap.xml
+++ b/META-INF/spring/eclipse.rap.xml
@@ -8,12 +8,9 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<!-- Eclipse rap platform -->
-	<!-- <flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap"> 
-		<flow:arg name="rapRelease" value="2.3" /> <flow:arg name="rapTimestamp" 
-		value="2.3.1-SR1-20140909-1638" /> </flow:flow> -->
 	<flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
-		<flow:arg name="rapRelease" value="2.2" />
-		<flow:arg name="rapTimestamp" value="2.2.0-R-20131204-0942" />
+		<flow:arg name="rapRelease" value="2.3" />
+		<flow:arg name="rapTimestamp" value="2.3.1-SR1-20140909-1638" />
 	</flow:flow>
 
 	<!-- Rap specs and templates -->
@@ -29,54 +26,40 @@
 				value="http://www.eclipse.org/downloads/rt/rap/@{rapRelease}/rap-@{rapTimestamp}.zip" />
 			<property name="includes">
 				<map>
-					<!-- Misc -->
-					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
-
-					<!-- Javax -->
-					<entry key="plugins/javax.xml_*.jar" value="org.argeo.tp.rap.platform" />
-					<!-- Provided by jetty -->
-					<!-- <entry key="plugins/javax.servlet_*.jar" value="org.argeo.tp.rap.platform" 
-						/> -->
-
 					<!-- Eclipse core -->
 					<entry key="plugins/org.eclipse.core.*.jar" value="org.argeo.tp.rap.platform" />
 
 					<!-- RWT -->
 					<entry key="plugins/org.eclipse.rap.rwt_*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/org.eclipse.rap.rwt.source_*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.rwt.osgi_*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/org.eclipse.rap.rwt.osgi.source_*.jar" value="org.argeo.tp.rap.platform" />
 
 					<!-- RAP UI with the workbench -->
-					<!-- Note: we do not include ui.cheatsheets for the time being -->
 					<entry key="plugins/org.eclipse.rap.ui.workbench*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.ui_*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/org.eclipse.rap.ui.source_*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.ui.views*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.jface*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.ui.forms*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.help*.jar" value="org.argeo.tp.rap.platform" />
 
-					<!-- Minimal Equinox dependencies, to be refined -->
-					<entry key="plugins/org.eclipse.equinox.*.jar" value="org.argeo.tp.rap" />
+					<!-- Misc -->
+					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
 				</map>
 			</property>
-			<property name="excludes">
-				<list>
-					<value><![CDATA[plugins/org.eclipse.equinox.console*.jar]]></value>
-				</list>
-			</property>
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
 	</flow:flow>
 
-	<!-- File upload Addons -->
+	<!-- Addons -->
 
-	<!-- !!!! WARNING !!!! The corresponding zip must be manually imported in 
-		corresponding workspace of the dist repo at path org/eclipse/www/downloads/rt/rap/addons/@{rapRelease}/ 
-		until we implement a cleaner way to directly retrieve the corresponding jars 
-		for eclipse repository -->
+	<!-- The corresponding zip must be manually imported in the dist repo at 
+		path org/eclipse/www/downloads/rt/rap/addons/@{rapRelease}/ -->
 
 	<flow:flow name="eclipse/org.argeo.tp.rap.addons" parent="template.importRapAddons">
-		<flow:arg name="rapRelease" value="0.5" />
-		<flow:arg name="rapTimestamp" value="0.5.0.argeo.20150109" />
+		<flow:arg name="rapRelease" value="0.6" />
+		<flow:arg name="rapTimestamp" value="0.6.0.v20150207" />
 	</flow:flow>
 
 	<flow:flow id="template.importRapAddons" spec="rapVersion.spec"
@@ -92,17 +75,4 @@
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
 	</flow:flow>
-	<!-- !!!! WARNING !!!! The corresponding zip must be manually imported in 
-		corresponding workspace of the dist repo at path org/eclipse/www/downloads/rt/rap/addons/fileupload/@{rapRelease}/ 
-		until we implement a cleaner way to directly retrieve the corresponding jars 
-		for eclipse repository -->
-
-	<!-- <flow:flow name="eclipse/org.argeo.tp.rap.addons.fileupload" parent="template.importRapFileUpload"> 
-		<flow:arg name="rapRelease" value="0.6" /> <flow:arg name="rapTimestamp" 
-		value="0.6.0-20140611-1558" /> </flow:flow> <flow:flow id="template.importRapFileUpload" 
-		spec="rapVersion.spec" abstract="true"> <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> 
-		<property name="uri" value="http://www.eclipse.org/downloads/rt/rap/addons/fileupload/@{rapRelease}/fileupload-@{rapTimestamp}.zip" 
-		/> <property name="includes"> <map> <entry key="plugins/org.eclipse.rap.addons.*.jar" 
-		value="org.argeo.tp.rap" /> </map> </property> <property name="osgiFactory" 
-		ref="osgiFactory" /> </bean> </flow:flow> -->
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 0bf598a..0688a37 100644
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -7,15 +7,29 @@
 	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:groupId="org.argeo.tp.javax"
-		p:sourceCoords="javax.inject:javax.inject:1" parent="template.mavenWrapper" />
+	<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" />
+		</property>
+	</bean>
 
-	<bean id="javax.el" p:version="2.2.5" p:groupId="org.argeo.tp.javax"
-		p:sourceCoords="javax.el:javax.el-api:2.2.5" parent="template.mavenWrapper" />
+	<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" />
+		</property>
+	</bean>
 
-	<bean id="javax.jcr" p:version="2.0.0" p:groupId="org.argeo.tp.javax"
-		p:sourceCoords="javax.jcr:jcr:2.0" parent="template.mavenWrapper" />
+	<bean id="javax.mail" p:sourceCoords="com.sun.mail:javax.mail:1.5.2"
+		parent="template.mavenJavax">
+		<property name="license">
+			<!-- GPL with classpath exception -->
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+		</property>
+	</bean>
 
-	<bean id="javax.mail" p:groupId="org.argeo.tp.javax"
-		p:sourceCoords="com.sun.mail:javax.mail:1.5.2" parent="template.mavenWrapper" />
+	<!-- Templates -->
+	<bean name="template.mavenJavax" p:groupId="org.argeo.tp.javax"
+		abstract="true" parent="template.mavenWrapper" />
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index ed8b0fc..dbc5ed6 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -7,21 +7,6 @@
 	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="org.aspectj.weaver" parent="template.bndWrapper">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					com.bea.jvm;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.slf4j.log4j12" parent="template.org.slf4j" />
-	<bean id="org.slf4j.api" parent="template.org.slf4j" />
-	<bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
-
 	<bean id="org.aopalliance" p:version="1.0.0" p:sourceCoords="aopalliance:aopalliance:1.0"
 		parent="template.mavenWrapper">
 		<property name="license">
@@ -59,7 +44,7 @@
 		</property>
 	</bean>
 
-	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.184"
+	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.185"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
 		<!-- <property name="doNotModifySources" value="true" /> -->
@@ -72,56 +57,56 @@
 		once the archiveMapper can manage tar.gz archives -->
 	<bean id="org.joda.time" p:sourceCoords="joda-time:joda-time:2.6"
 		parent="template.mavenWrapper">
-		<property name="doNotModify" value="true" />
+		<!-- <property name="doNotModify" value="true" /> -->
 		<property name="license">
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					org.joda.convert.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
 	</bean>
 
-	<!--  Needed by jsch: it is defined as optional via bnd -->
-	<!--  <bean id="com.jcraft.jzlib" p:sourceCoords="com.jcraft:jzlib:1.1.3"
+	<bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
 		parent="template.mavenWrapper">
 		<property name="license">
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
 		</property>
-	</bean> -->
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.jcraft.jzlib;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
 
-	<bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
+	<bean id="org.aspectj.weaver" p:sourceCoords="org.aspectj:aspectjweaver:jar:1.7.4"
 		parent="template.mavenWrapper">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
 				<prop key="Import-Package">
-					com.jcraft.jzlib;resolution:=optional,
+					com.bea.jvm;resolution:=optional,
 					*
 				</prop>
 			</props>
 		</property>
 	</bean>
 
-	<!-- AspectJ Factory -->
-	<flow:flow name="misc/org.aspectj" spec="spec.version">
-		<flow:arg name="version" value="1.7.3" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/tools/aspectj/aspectj-@{version}.jar" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry key="lib/aspectjweaver.jar" value-ref="org.aspectj.weaver" />
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<!-- SLF4J Factory -->
-	<bean id="template.org.slf4j" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp" />
+	<bean id="org.objectweb.asm" p:version="3.1.0"
+		p:sourceCoords="org.eclipse.jetty.orbit:org.objectweb.asm:3.1.0.v200803061910"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+		</property>
 	</bean>
 
 	<flow:flow name="misc/org.slf4j" spec="spec.version">
@@ -134,12 +119,15 @@
 			</property>
 			<property name="wrappers">
 				<map>
-					<entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar"
-						value-ref="org.slf4j.log4j12" />
-					<entry key="slf4j-@{version}/slf4j-api-@{version}.jar"
-						value-ref="org.slf4j.api" />
-					<entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar"
-						value-ref="org.slf4j.commons.logging" />
+					<entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar">
+						<bean id="org.slf4j.log4j12" parent="template.bndWrapper" />
+					</entry>
+					<entry key="slf4j-@{version}/slf4j-api-@{version}.jar">
+						<bean id="org.slf4j.api" parent="template.bndWrapper" />
+					</entry>
+					<entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar">
+						<bean id="org.slf4j.commons.logging" parent="template.bndWrapper" />
+					</entry>
 				</map>
 			</property>
 		</bean>
diff --git a/META-INF/spring/spring.security.xml b/META-INF/spring/spring.security.xml
index b912e45..3ee412e 100644
--- a/META-INF/spring/spring.security.xml
+++ b/META-INF/spring/spring.security.xml
@@ -40,10 +40,6 @@
 						key="spring-security-@{version}/dist/spring-security-core-@{version}.jar">
 						<bean id="org.springframework.security.core" parent="template.spring.security" />
 					</entry>
-					<entry
-						key="spring-security-@{version}/dist/spring-security-crypto-@{version}.jar">
-						<bean id="org.springframework.security.crypto" parent="template.spring.security" />
-					</entry>
 					<entry
 						key="spring-security-@{version}/dist/spring-security-ldap-@{version}.jar">
 						<bean id="org.springframework.security.ldap" parent="template.spring.security" />
diff --git a/META-INF/spring/spring.xml b/META-INF/spring/spring.xml
index 0fd66fa..f9e76e0 100644
--- a/META-INF/spring/spring.xml
+++ b/META-INF/spring/spring.xml
@@ -71,6 +71,7 @@
 				<prop key="Import-Package">
 					joptsimple;resolution:=optional,
 					org.springframework.asm.tree;resolution:=optional,
+					org.apache.tools.ant.*;resolution:=optional,
 					*
 				</prop>
 			</props>
diff --git a/META-INF/spring/templates.xml b/META-INF/spring/templates.xml
index 9441144..89fe358 100644
--- a/META-INF/spring/templates.xml
+++ b/META-INF/spring/templates.xml
@@ -20,7 +20,7 @@
 
 	<bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
 		abstract="true">
-		<property name="groupId" value="org.argeo.tp" />
+		<property name="groupId" value="org.argeo.tp.misc" />
 		<property name="bndProperties">
 			<props>
 				<prop key="Export-Package">*</prop>
@@ -29,7 +29,7 @@
 	</bean>
 	<bean id="template.mavenWrapper" class="org.argeo.slc.repo.osgi.MavenWrapper"
 		abstract="true">
-		<property name="groupId" value="org.argeo.tp" />
+		<property name="groupId" value="org.argeo.tp.misc" />
 		<property name="bndProperties">
 			<props>
 				<prop key="Export-Package">*</prop>
diff --git a/pom.xml b/pom.xml
index 879135f..f0a26e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>lib</artifactId>
-		<version>1.1.19</version>
+		<version>1.1.20</version>
 	</parent>
 	<groupId>org.argeo.tp.factory</groupId>
 	<artifactId>org.argeo.tp.factory.core</artifactId>
-- 
2.30.2