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 3ac5c65bd91a69901ea6975ce79e18791ef2f20b..d765fb09293c5edbbcdf6278ec0ffb6a435ec538 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,48 +14,48 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp:2.1.21" />
+                       value="org.argeo.tp:argeo-tp:2.1.26-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
-                               <!-- <ref bean="javax.inject" /> -->
                                <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" /> -->
 
-                               <!-- 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="org.apache.sshd.core" />
+                               <ref bean="apache/org.apache.sshd" />
+                               <ref bean="org.apache.tomcat.jni" />
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -70,30 +70,29 @@
                                <ref bean="apache/org.apache.commons.net" />
                                <ref bean="apache/org.apache.commons.exec" />
                                <ref bean="apache/org.apache.commons.math3" />
-                               <!-- <ref bean="apache/org.apache.commons.jxpath" /> -->
-                               <!-- <ref bean="apache/org.apache.commons.jci" /> -->
+                               <ref bean="apache/org.apache.commons.cli" />
                                <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" />
@@ -105,14 +104,23 @@
                                <ref bean="org.apache.xml.resolver" />
                                <ref bean="org.apache.xerces" />
                                <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="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" />
-                               <!-- <ref bean="misc/org.tmatesoft.svnkit" /> -->
                        </list>
                </property>
        </bean>
@@ -121,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.21" />
+                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.26-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -133,10 +141,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.21" />
+                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.26-SNAPSHOT" />
                <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>
@@ -145,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.21" />
+       value="org.argeo.tp:argeo-tp-rap-e3:2.1.26-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />