X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fjavax.xml;h=a7920873945f38d8a37f00b0293354964e00e712;hb=585573bd4db81adf7c81abe52977390b74e0162e;hp=046b2221f6443d60f7115f671501eff75dcd1978;hpb=7d3bf9314a7f856fa1c7d3a2633a7e30f0688718;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 046b222..a792087 100644
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -26,42 +26,72 @@
 		</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" 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 -->
@@ -70,12 +100,29 @@
 		</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" />