X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=d765fb09293c5edbbcdf6278ec0ffb6a435ec538;hp=5bb0543e5a66edf07a6bd6dd40a8006260d17a3a;hb=0c8c3aeba62212742ca5e0f632d3129cb228a496;hpb=70df887e075f3e4d2d67d6e65eb58e2ddc1eea0f

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 5bb0543..d765fb0 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,18 +14,21 @@
 		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
 		<constructor-arg
-			value="org.argeo.tp:argeo-tp:2.1.25-SNAPSHOT" />
+			value="org.argeo.tp:argeo-tp:2.1.26-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<!-- Javax -->
 				<ref bean="javax.jcr" />
-				<ref bean="javax.transaction" />
+				<ref bean="javax.el-api" />
+				<ref bean="javax.interceptor-api" />
+				<ref bean="javax.enterprise.cdi-api" />
+				<ref bean="javax.transaction-api" />
 				<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.persistence" /> -->
+				<!-- <ref bean="javax.xml.bind" /> -->
+				<!-- <ref bean="javax.ws.rs" /> -->
 				<!-- <ref bean="javax.annotation" /> -->
 
 				<!-- Standalone projects -->
@@ -42,7 +45,7 @@
 				<ref bean="org.w3c.dom.svg" />
 				<ref bean="org.tukaani.xz" />
 				<ref bean="net.i2p.crypto.eddsa" />
-				<ref bean="javassist" />
+				<ref bean="org.yaml.snakeyaml" />
 
 				<!-- Apache -->
 				<ref bean="apache/org.apache.log4j" />
@@ -73,11 +76,12 @@
 
 				<!-- Web services -->
 				<ref bean="ws/jackson" />
-				<ref bean="ws/hk2" />
-				<ref bean="ws/jersey" />
+				<!-- <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 -->
@@ -111,7 +115,9 @@
 				<!-- ALM -->
 				<ref bean="org.junit" />
 				<ref bean="org.hamcrest" />
-				<ref bean="org.osgi.annotation.bundle" />
+				<ref bean="osgi.annotation" />
+				<ref bean="org.osgi.service.metatype.annotations" />
+				<ref bean="org.osgi.service.component.annotations" />
 				<ref bean="biz.aQute.bndlib" />
 				<ref bean="org.redline-rpm" />
 				<ref bean="org.eclipse.jgit" />
@@ -123,7 +129,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.25-SNAPSHOT" />
+			value="org.argeo.tp:argeo-tp-rap-e4:2.1.26-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -135,7 +141,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.25-SNAPSHOT" />
+			value="org.argeo.tp:argeo-tp-rcp-e4:2.1.26-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -149,7 +155,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.25-SNAPSHOT" />
+	value="org.argeo.tp:argeo-tp-rap-e3:2.1.26-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.platform" />