X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=6785f1fc9392b394207a49bc5072c2d0007a5b79;hb=b08d11c357100c486744a8fadb0f1771a3c5e57f;hp=2c222e6cd8fd70cdca9efa701dc35ce1c3b36c8d;hpb=c4f02aa2cebe7dd7be11626f5a8ce99c186f65ec;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 2c222e6..6785f1f 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,49 +14,45 @@
 		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
 		<constructor-arg
-			value="org.argeo.tp:argeo-tp:2.1.22" />
+			value="org.argeo.tp:argeo-tp:2.1.25" />
 		<property name="modules">
 			<list>
 				<!-- Javax -->
-				<!-- <ref bean="javax.inject" /> -->
 				<ref bean="javax.jcr" />
 				<ref bean="javax.transaction" />
 				<ref bean="javax.mail" />
+				<!-- Javax4hipsters -->
+				<ref bean="javax.websocket" />
+				<!-- <ref bean="javax.persistence" /> -->
+				<!-- <ref bean="javax.xml.bind" /> -->
+				<!-- <ref bean="javax.ws.rs" /> -->
 				<!-- <ref bean="javax.annotation" /> -->
 
-				<!-- Builder -->
-				<ref bean="biz.aQute.bnd" />
-				<!-- <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" /> -->
-
 				<!-- Standalone projects -->
 				<ref bean="misc/org.slf4j" />
+				<ref bean="slf4j.osgi" />
 				<ref bean="org.aopalliance" />
-				<ref bean="org.junit" />
-				<!-- <ref bean="org.joda.time" /> -->
 				<ref bean="com.jcraft.jsch" />
 				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
 				<ref bean="org.objectweb.asm" />
 				<ref bean="org.aspectj.weaver" />
 				<ref bean="misc/org.bouncycastle" />
-				<!-- <ref bean="org.quartz-scheduler.quartz" /> -->
-				<!-- <ref bean="org.quartz-scheduler.quartz.jobs" /> -->
 				<ref bean="bitronix.tm" />
-				<!-- <ref bean="misc/org.w3c.css.sac" /> -->
-				<!-- <ref bean="com.steadystate.css" /> -->
 				<ref bean="com.googlecode.javaewah.JavaEWAH" />
 				<ref bean="org.w3c.dom.svg" />
 				<ref bean="org.tukaani.xz" />
 				<ref bean="net.i2p.crypto.eddsa" />
+				<ref bean="org.yaml.snakeyaml" />
 
 				<!-- 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" />
 
 				<!-- Apache Commons -->
 				<ref bean="apache/org.apache.commons.io" />
@@ -72,30 +68,28 @@
 				<ref bean="apache/org.apache.commons.exec" />
 				<ref bean="apache/org.apache.commons.math3" />
 				<ref bean="apache/org.apache.commons.cli" />
-				<!-- <ref bean="apache/org.apache.commons.jxpath" /> -->
-				<!-- <ref bean="apache/org.apache.commons.jci" /> -->
 				<ref bean="apache/org.apache.commons.compress" />
 				<ref bean="apache/org.apache.commons.lang3" />
 
+				<!-- Web services -->
+				<ref bean="ws/jackson" />
+				<!-- <ref bean="ws/hk2" /> -->
+				<!-- <ref bean="ws/jersey" /> -->
+
 				<!-- Google -->
 				<ref bean="com.google.guava" />
+				<ref bean="com.google.guava.failureaccess" />
 				<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" />
+				<ref bean="apache/org.apache.jackrabbit.vault" />
 
 				<!-- Document generation and management -->
 				<ref bean="net.sf.jxl" />
@@ -109,15 +103,19 @@
 				<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" />
-				<ref bean="org.dbunit" />
+
 				<!-- ALM -->
+				<ref bean="org.junit" />
+				<ref bean="org.hamcrest" />
+				<ref bean="org.osgi.annotation.bundle" />
+				<ref bean="biz.aQute.bndlib" />
 				<ref bean="org.redline-rpm" />
 				<ref bean="org.eclipse.jgit" />
-				<!-- <ref bean="misc/org.tmatesoft.svnkit" /> -->
 			</list>
 		</property>
 	</bean>
@@ -126,7 +124,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" />
+			value="org.argeo.tp:argeo-tp-rap-e4:2.1.25" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -138,10 +136,12 @@
 		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" />
+			value="org.argeo.tp:argeo-tp-rcp-e4:2.1.25" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rcp.e4" />
+				<ref bean="org.eclipse.text" />
+				<ref bean="org.eclipse.jface.text" />
 			</list>
 		</property>
 	</bean>
@@ -150,7 +150,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" />
+	value="org.argeo.tp:argeo-tp-rap-e3:2.1.25" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.platform" />