projects
/
gpl
/
argeo-tp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 6785f1fc9392b394207a49bc5072c2d0007a5b79..d765fb09293c5edbbcdf6278ec0ffb6a435ec538 100644
(file)
--- a/
META-INF/spring/distribution.xml
+++ b/
META-INF/spring/distribution.xml
@@
-14,12
+14,15
@@
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:2.1.2
5
" />
+ value="org.argeo.tp:argeo-tp:2.1.2
6-SNAPSHOT
" />
<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.mail" />
<!-- Javax4hipsters -->
<ref bean="javax.websocket" />
<ref bean="javax.mail" />
<!-- Javax4hipsters -->
<ref bean="javax.websocket" />
@@
-112,7
+115,9
@@
<!-- ALM -->
<ref bean="org.junit" />
<ref bean="org.hamcrest" />
<!-- 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" />
<ref bean="biz.aQute.bndlib" />
<ref bean="org.redline-rpm" />
<ref bean="org.eclipse.jgit" />
@@
-124,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
" />
+ value="org.argeo.tp:argeo-tp-rap-e4:2.1.2
6-SNAPSHOT
" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.e4" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@
-136,7
+141,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-rcp-e4:2.1.2
5
" />
+ value="org.argeo.tp:argeo-tp-rcp-e4:2.1.2
6-SNAPSHOT
" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rcp.e4" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@
-150,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
" />
+ value="org.argeo.tp:argeo-tp-rap-e3:2.1.2
6-SNAPSHOT
" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.platform" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.platform" />