X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fjavax.xml;h=3f439f7c97c19bd0b3ebdd6e3fccf4d3536e34d8;hb=1d0d57193ea0d433575c519d51d549271ff62f2b;hp=3a7aa7ace1d3651ac9ffdb470441d014e8bdff84;hpb=f3c53c0efd474aa24e034583300182b0bc98b58b;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 3a7aa7a..3f439f7 100644
--- 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,11 +40,33 @@
 		</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">
+			<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"
 		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>