Update Javax APIs in order to build with Java 11 constraints. OSGi

[gpl/argeo-tp.git] / META-INF / spring / distribution.xml

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index fe785f239409768761284e4a744d42f981d50a11..d765fb09293c5edbbcdf6278ec0ffb6a435ec538 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,20 +14,27 @@
                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.annotation" /> -->
 
                                <!-- Standalone projects -->
                                <ref bean="misc/org.slf4j" />
                                <ref bean="slf4j.osgi" />
                                <ref bean="org.aopalliance" />
-                               <ref bean="org.junit" />
                                <ref bean="com.jcraft.jsch" />
                                <ref bean="EDU.oswego.cs.dl.util.concurrent" />
                                <ref bean="org.objectweb.asm" />
@@ -38,6 +45,7 @@
                                <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" />
@@ -66,8 +74,14 @@
                                <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 -->
@@ -99,7 +113,11 @@
                                <ref bean="org.h2" />
 
                                <!-- ALM -->
-                               <ref bean="org.osgi.annotation.bundle" />
+                               <ref bean="org.junit" />
+                               <ref bean="org.hamcrest" />
+                               <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" />
@@ -111,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" />
@@ -123,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" />
@@ -137,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" />