projects
/
gpl
/
argeo-tp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Argeo TP v2.1.27, for Java 11 support.
[gpl/argeo-tp.git]
/
META-INF
/
spring
/
distribution.xml
diff --git
a/META-INF/spring/distribution.xml
b/META-INF/spring/distribution.xml
index 52f5a98fd49e8c37e3a8dc8c5ba0b0f08f869bdd..a579eb627c29526cd5f16f7122dd2c490c3c830c 100644
(file)
--- a/
META-INF/spring/distribution.xml
+++ b/
META-INF/spring/distribution.xml
@@
-13,21
+13,28
@@
<bean id="argeo-tp"
class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
init-method="init" destroy-method="destroy">
<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.27" />
<property name="modules">
<list>
<!-- Javax -->
<ref bean="javax.jcr" />
<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" />
<ref bean="javax.mail" />
+ <!-- Javax4hipsters -->
<ref bean="javax.websocket" />
<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" />
<!-- 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" />
<ref bean="com.jcraft.jsch" />
<ref bean="EDU.oswego.cs.dl.util.concurrent" />
<ref bean="org.objectweb.asm" />
@@
-35,14
+42,15
@@
<ref bean="misc/org.bouncycastle" />
<ref bean="bitronix.tm" />
<ref bean="com.googlecode.javaewah.JavaEWAH" />
<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.tukaani.xz" />
<ref bean="net.i2p.crypto.eddsa" />
+ <ref bean="org.yaml.snakeyaml" />
<!-- Apache -->
<ref bean="apache/org.apache.log4j" />
<!-- 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" />
<ref bean="apache/org.apache.httpcomponents.httpcore" />
<ref bean="apache/org.apache.httpcomponents.httpclient" />
<ref bean="org.apache.mina.core" />
@@
-66,8
+74,14
@@
<ref bean="apache/org.apache.commons.compress" />
<ref bean="apache/org.apache.commons.lang3" />
<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" />
<!-- Google -->
<ref bean="com.google.guava" />
+ <ref bean="com.google.guava.failureaccess" />
<ref bean="com.google.gson" />
<!-- Eclipse -->
<ref bean="com.google.gson" />
<!-- Eclipse -->
@@
-99,7
+113,11
@@
<ref bean="org.h2" />
<!-- ALM -->
<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" />
<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
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.2
5-SNAPSHOT
" />
+ value="org.argeo.tp:argeo-tp-rap-e4:2.1.2
7
" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.e4" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@
-123,10
+141,12
@@
class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
init-method="init" destroy-method="destroy">
<constructor-arg
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.2
5-SNAPSHOT
" />
+ value="org.argeo.tp:argeo-tp-rcp-e4:2.1.2
7
" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rcp.e4" />
<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>
</list>
</property>
</bean>
@@
-135,7
+155,7
@@
class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
init-method="init" destroy-method="destroy">
<constructor-arg
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.2
5-SNAPSHOT
" />
+ value="org.argeo.tp:argeo-tp-rap-e3:2.1.2
7
" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.platform" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.platform" />