Work on Jersey packaging.

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

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 24ac8d0d000243321bc91df3a7024c660360ea6a..1daeb1e8f24cfe4d1f59d94a08c6e5233615477c 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -1,30 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:flow="http://www.argeo.org/schema/slc-flow"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-       <bean id="javax.inject" p:version="1.0.0" p:sourceCoords="javax.inject:javax.inject:1"
+       <bean id="javax.inject" p:version="1.0.0"
+               p:sourceCoords="javax.inject:javax.inject:1"
                parent="template.mavenJavax">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
        </bean>
 
-       <bean id="javax.jcr" p:version="2.0.0" p:sourceCoords="javax.jcr:jcr:2.0"
-               parent="template.mavenJavax">
+       <bean id="javax.jcr" p:version="2.0.0"
+               p:sourceCoords="javax.jcr:jcr:2.0" parent="template.mavenJavax">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
        </bean>
 
-       <bean id="javax.transaction" p:version="1.1.0" p:sourceCoords="javax.transaction:jta:1.1"
+       <bean id="javax.transaction" p:version="1.1.0"
+               p:sourceCoords="javax.transaction:jta:1.1"
                parent="template.mavenJavax">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
                </property>
                <property name="bndProperties">
                        <props merge="true">
@@ -33,22 +40,59 @@
                </property>
        </bean>
 
-       <bean id="javax.mail" p:sourceCoords="com.sun.mail:javax.mail:1.5.2"
+       <!-- 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.mail"
+               p:sourceCoords="com.sun.mail:javax.mail:1.6.2"
                parent="template.mavenJavax">
                <property name="license">
-                       <!-- GPL with classpath exception -->
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
                </property>
        </bean>
 
-       <bean id="javax.annotation" p:version="1.2.0" p:sourceCoords="javax.annotation:javax.annotation-api:1.2"
+       <bean id="javax.annotation"
+               p:sourceCoords="javax.annotation:javax.annotation-api:1.3.2"
                parent="template.mavenJavax">
                <property name="license">
                        <!-- GPL with classpath exception -->
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.GPL" />
                </property>
        </bean>
 
+       <!-- Hipster technologies -->
+       <bean id="javax.websocket"
+               p:sourceCoords="javax.websocket:javax.websocket-api:1.1"
+               parent="template.mavenJavax">
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="javax.persistence"
+               p:sourceCoords="org.eclipse.persistence:javax.persistence:2.2.1"
+               parent="template.mavenJavax">
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="javax.ws.rs"
+               p:sourceCoords="javax.ws.rs:javax.ws.rs-api:2.1.1"
+               parent="template.mavenJavax">
+       </bean>
+
+       <bean id="javax.xml.bind" p:version="2.4.0"
+               p:sourceCoords="javax.xml.bind:jaxb-api:2.4.0-b180830.0359"
+               parent="template.mavenJavax">
+       </bean>
+
        <!-- Templates -->
        <bean name="template.mavenJavax" p:groupId="org.argeo.tp.javax"
                abstract="true" parent="template.mavenWrapper" />