X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fsdk.xml;h=69801a783415dfb24bfd77fe738b73b7f9d8c419;hb=ecdf6175f8e4890303ca422102d461a1c2887cbd;hp=08bf8a7931d1f466e37c02c21f96ad867127eeda;hpb=4347148fe5111eb703fefedaeba5e3fe65cf2f34;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index 08bf8a7..69801a7 100644
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -1,16 +1,19 @@
 <?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="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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.EPL" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -23,37 +26,57 @@
 		</property>
 	</bean>
 
-	<bean id="biz.aQute.bnd" p:sourceCoords="biz.aQute:bnd:1.50.0"
-		parent="template.mavenSdk">
+	<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.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.BSD" />
 		</property>
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					org.eclipse.*;resolution:=optional,
-					org.apache.tools.ant.*;resolution:=optional,
-					junit.*;resolution:=optional,
-					*
-				</prop>
-			</props>
+		<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">
+		<property name="license">
+			<util:constant
+				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> -->
 	</bean>
 
-	<!-- JGit -->
-	<bean id="org.eclipse.jgit" p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:3.6.2.201501210735-r"
+	<bean id="org.osgi.annotation.bundle"
+		p:sourceCoords="org.osgi:org.osgi.annotation.bundle:1.0.0"
 		parent="template.mavenSdk">
 		<property name="doNotModify" value="true" />
 		<property name="license">
-			<!-- Eclipse Distribution License (EDL) -->
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
 
 	<bean id="org.dbunit" p:sourceCoords="org.dbunit:dbunit:2.5.0"
 		parent="template.mavenSdk">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -64,15 +87,19 @@
 		</property>
 	</bean>
 
-	<bean id="org.redline-rpm" p:sourceCoords="org.redline-rpm:redline:1.2.1"
+	<bean id="org.redline-rpm"
+		p:sourceCoords="org.redline-rpm:redline:1.2.8"
 		parent="template.mavenSdk">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.MIT" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
 				<prop key="Import-Package">
 					sun.security.*;resolution:=optional,
+					org.apache.tools.ant.*;resolution:=optional,
+					org.apache.tools.zip;resolution:=optional,
 					*
 				</prop>
 			</props>
@@ -81,13 +108,15 @@
 
 
 	<!-- SVN Kit -->
-	<flow:flow name="misc/org.tmatesoft.svnkit" spec="spec.version">
+	<flow:flow name="misc/org.tmatesoft.svnkit"
+		spec="spec.version">
 		<flow:arg name="version" value="1.8.12" />
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
 				value="https://svnkit.com/org.tmatesoft.svn_@{version}.standalone.nojna.zip" />
 			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+				<util:constant
+					static-field="org.argeo.slc.repo.FreeLicense.EPL" />
 			</property>
 			<property name="wrappers">
 				<map>
@@ -112,7 +141,8 @@
 			</property>
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="base" value="/svnkit-@{version}/svnkit/src/main/java/" />
+					<property name="base"
+						value="/svnkit-@{version}/svnkit/src/main/java/" />
 					<property name="uri"
 						value="https://svnkit.com/org.tmatesoft.svn_@{version}.src.zip" />
 					<property name="osgiFactory" ref="osgiFactory" />