X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=9edbd77171e11b9d951c73fdc987d29b657c7a57;hb=585573bd4db81adf7c81abe52977390b74e0162e;hp=c3a09302347b0c38f6c47ff5aaa946016e8c0945;hpb=ecdf6175f8e4890303ca422102d461a1c2887cbd;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index c3a0930..9edbd77 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,15 +13,23 @@
 	<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.25-SNAPSHOT" />
+		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.28-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.activation" />
 				<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" /> -->
 
 				<!-- Standalone projects -->
 				<ref bean="misc/org.slf4j" />
@@ -34,14 +42,15 @@
 				<ref bean="misc/org.bouncycastle" />
 				<ref bean="bitronix.tm" />
 				<ref bean="com.googlecode.javaewah.JavaEWAH" />
-				<ref bean="org.w3c.dom.svg" />
+				<!-- <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.xmlgraphics" />
-				<ref bean="apache/org.apache.batik" />
+				<!-- <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" />
@@ -66,11 +75,13 @@
 				<ref bean="apache/org.apache.commons.lang3" />
 
 				<!-- Web services -->
-				<ref bean="jackson" />
-				<ref bean="jersey" />
-				
+				<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 -->
@@ -104,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" />
@@ -116,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.28-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -128,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.28-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -142,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.28-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.platform" />
@@ -185,7 +198,7 @@
 		</property>
 		<property name="mavenRepositories">
 			<list>
-				<value>http://repo1.maven.org/maven2/</value>
+				<value>https://repo1.maven.org/maven2/</value>
 				<value>http://download.eclipse.org/gemini/mvn/</value>
 			</list>
 		</property>