X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=META-INF%2Fspring%2Fdistribution.xml;h=fb67db34d3d03dc68171c00535270e89915c7784;hb=c5a22d8223b66c67bd243cffdbda0b2e0f267141;hp=30c813dfe91408ef3917d7c8e9190ad05b08e71b;hpb=1d0d57193ea0d433575c519d51d549271ff62f2b;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 30c813d..fb67db3 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,16 +13,14 @@
 	<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.22-SNAPSHOT" />
+		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.25-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<!-- Javax -->
-				<!-- <ref bean="javax.inject" /> -->
 				<ref bean="javax.jcr" />
 				<ref bean="javax.transaction" />
 				<ref bean="javax.mail" />
-				<!-- <ref bean="javax.annotation" /> -->
+				<ref bean="javax.websocket" />
 
 				<!-- Builder -->
 				<ref bean="biz.aQute.bnd" />
@@ -50,13 +48,15 @@
 
 				<!-- Apache -->
 				<ref bean="apache/org.apache.log4j" />
-				<ref bean="apache/org.apache.ant" />
 				<ref bean="apache/org.apache.xmlgraphics" />
 				<ref bean="apache/org.apache.batik" />
 				<ref bean="apache/org.apache.httpcomponents.httpcore" />
 				<ref bean="apache/org.apache.httpcomponents.httpclient" />
 				<ref bean="org.apache.mina.core" />
 				<ref bean="apache/org.apache.sshd" />
+				<ref bean="org.apache.tomcat.jni" />
+				<!-- <ref bean="org.apache.aries.util" /> -->
+				<!-- <ref bean="org.apache.aries.spifly.dynamic.bundle" /> -->
 
 				<!-- Apache Commons -->
 				<ref bean="apache/org.apache.commons.io" />
@@ -82,21 +82,14 @@
 				<ref bean="com.google.gson" />
 
 				<!-- Eclipse -->
-				<!-- <ref bean="eclipse/org.argeo.tp.jetty" /> -->
+				<ref bean="eclipse/org.argeo.tp.jetty" />
 				<ref bean="eclipse/org.argeo.tp.equinox" />
-				<ref bean="eclipse/org.argeo.tp.gemini" />
-
-				<!-- Eclipse RAP -->
-				<!-- <ref bean="eclipse/org.argeo.tp.rap.platform" /> -->
 
 				<!-- 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" />
-
 				<!-- Document generation and management -->
 				<ref bean="net.sf.jxl" />
 				<ref bean="apache/org.apache.pdfbox" />
@@ -109,7 +102,8 @@
 				<ref bean="apache/org.apache.poi" />
 				<ref bean="org.jsoup" />
 				<ref bean="misc/com.vladsch.flexmark" />
-				
+				<ref bean="org.freemarker" />
+
 				<!-- Databases -->
 				<ref bean="org.postgresql.jdbc42" />
 				<ref bean="org.h2" />
@@ -126,7 +120,7 @@
 		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.22-SNAPSHOT" />
+			value="org.argeo.tp:argeo-tp-rap-e4:2.1.25-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -138,7 +132,7 @@
 		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.22-SNAPSHOT" />
+			value="org.argeo.tp:argeo-tp-rcp-e4:2.1.25-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -150,7 +144,7 @@
 		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.22-SNAPSHOT" />
+			value="org.argeo.tp:argeo-tp-rap-e3:2.1.25-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.platform" />