X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fsdk.xml;h=bfd313952fe8e31d9f481891ec2e7fc21f6f7e2a;hb=585573bd4db81adf7c81abe52977390b74e0162e;hp=9d1a345409ff3e36702212751a83567cfcdcb82f;hpb=33a947c8e5e74a6d84f6fd7de6f3c3fbd7d155b5;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index 9d1a345..bfd3139 100644
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -9,8 +9,8 @@
 	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="org.junit" p:version="4.11.0"
-		p:sourceCoords="junit:junit:4.11" parent="template.mavenSdk">
+	<bean id="org.junit" p:version="4.12.0"
+		p:sourceCoords="junit:junit:4.12" parent="template.mavenSdk">
 		<property name="license">
 			<util:constant
 				static-field="org.argeo.slc.repo.FreeLicense.EPL" />
@@ -26,6 +26,15 @@
 		</property>
 	</bean>
 
+	<bean id="org.hamcrest" p:version="2.1.0"
+		p:sourceCoords="org.hamcrest:hamcrest:2.1" parent="template.mavenSdk">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+		</property>
+		<property name="doNotModify" value="true" />
+	</bean>
+
 	<bean id="biz.aQute.bndlib"
 		p:sourceCoords="biz.aQute.bnd:biz.aQute.bndlib:4.2.0"
 		parent="template.mavenSdk">
@@ -34,27 +43,47 @@
 				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="doNotModify" value="true" />
-<!-- 		<property name="bndProperties"> -->
-<!-- 			<props merge="true"> -->
-<!-- 				<prop key="Import-Package"> -->
-<!-- 					com.cloudius.*;resolution:=optional, -->
-<!-- 					com.google.*;resolution:=optional, -->
-<!-- 					org.eclipse.*;resolution:=optional, -->
-<!-- 					org.apache.tools.ant.*;resolution:=optional, -->
-<!-- 					junit.*;resolution:=optional, -->
-<!-- 					slf4j.*;resolution:=optional, -->
-<!-- 					!org.osgi.annotation.*, -->
-<!-- 					org.osgi.namespace.*;resolution:=optional, -->
-<!-- 					org.osgi.service.*;resolution:=optional, -->
-<!-- 					sun.misc;resolution:=optional, -->
-<!-- 					* -->
-<!-- 				</prop> -->
-<!-- 			</props> -->
-<!-- 		</property> -->
+		<!-- <property name="bndProperties"> -->
+		<!-- <props merge="true"> -->
+		<!-- <prop key="Import-Package"> -->
+		<!-- com.cloudius.*;resolution:=optional, -->
+		<!-- com.google.*;resolution:=optional, -->
+		<!-- org.eclipse.*;resolution:=optional, -->
+		<!-- org.apache.tools.ant.*;resolution:=optional, -->
+		<!-- junit.*;resolution:=optional, -->
+		<!-- slf4j.*;resolution:=optional, -->
+		<!-- !org.osgi.annotation.*, -->
+		<!-- org.osgi.namespace.*;resolution:=optional, -->
+		<!-- org.osgi.service.*;resolution:=optional, -->
+		<!-- sun.misc;resolution:=optional, -->
+		<!-- * -->
+		<!-- </prop> -->
+		<!-- </props> -->
+		<!-- </property> -->
+	</bean>
+
+	<bean id="osgi.annotation"
+		p:sourceCoords="org.osgi:osgi.annotation:7.0.0"
+		parent="template.mavenSdk">
+		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
+	<bean id="org.osgi.service.metatype.annotations"
+		p:sourceCoords="org.osgi:org.osgi.service.metatype.annotations:1.4.0"
+		parent="template.mavenSdk">
+		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
 	</bean>
 
-	<bean id="org.osgi.annotation.bundle"
-		p:sourceCoords="org.osgi:org.osgi.annotation.bundle:1.0.0"
+	<bean id="org.osgi.service.component.annotations"
+		p:sourceCoords="org.osgi:org.osgi.service.component.annotations:1.4.0"
 		parent="template.mavenSdk">
 		<property name="doNotModify" value="true" />
 		<property name="license">