Argeo TP v2.1.27, for Java 11 support.

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

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 1daeb1e8f24cfe4d1f59d94a08c6e5233615477c..a7920873945f38d8a37f00b0293354964e00e712 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -26,38 +26,68 @@
                </property>
        </bean>
 
-       <bean id="javax.transaction" p:version="1.1.0"
-               p:sourceCoords="javax.transaction:jta:1.1"
+       <bean id="javax.transaction-api"
+               p:sourceCoords="javax.transaction:javax.transaction-api:1.3"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="javax.activation"
+               p:sourceCoords="com.sun.activation:javax.activation:1.2.0"
                parent="template.mavenJavax">
                <property name="license">
                        <util:constant
                                static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
                </property>
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Fragment-Host">system.bundle; extension:=framework</prop>
-                       </props>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="javax.interceptor-api"
+               p:sourceCoords="javax.interceptor:javax.interceptor-api:1.2.2"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="javax.el-api"
+               p:sourceCoords="javax.el:javax.el-api:2.2.5"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.GPL" />
                </property>
+               <property name="doNotModify" value="true" />
        </bean>
 
-       <!-- Javax transaction 1.3 has dependencies -->
-       <!-- <bean id="javax.transaction-api" p:version="1.3" -->
-       <!-- p:sourceCoords="javax.transaction:javax.transaction-api:1.3" -->
-       <!-- parent="template.mavenJavax"> -->
-       <!-- <property name="license"> -->
-       <!-- <util:constant -->
-       <!-- static-field="org.argeo.slc.repo.FreeLicense.CDDL" /> -->
-       <!-- </property> -->
-       <!-- <property name="doNotModify" value="true" /> -->
-       <!-- </bean> -->
+       <bean id="javax.enterprise.cdi-api" p:version="2.0.0.SP1"
+               p:sourceCoords="javax.enterprise:cdi-api:2.0.SP1"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
 
        <bean id="javax.mail"
-               p:sourceCoords="com.sun.mail:javax.mail:1.6.2"
+               p:sourceCoords="javax.mail:javax.mail-api:1.6.2"
                parent="template.mavenJavax">
                <property name="license">
                        <util:constant
                                static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
                </property>
+               <property name="doNotModify" value="true" />
        </bean>
 
        <bean id="javax.annotation"