From dd3250606fef4edd1cd0ec1ce4da321521bdd91a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 5 Oct 2019 11:18:23 +0200
Subject: [PATCH] Remove DB Unit.

---
 META-INF/spring/distribution.xml | 5 +++--
 META-INF/spring/sdk.xml          | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index fb67db3..ef9d782 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,7 +13,8 @@
 	<bean id="argeo-tp"
 		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
-		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.25-SNAPSHOT" />
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp:2.1.25-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<!-- Javax -->
@@ -107,7 +108,7 @@
 				<!-- Databases -->
 				<ref bean="org.postgresql.jdbc42" />
 				<ref bean="org.h2" />
-				<ref bean="org.dbunit" />
+				<!-- <ref bean="org.dbunit" /> -->
 				<!-- ALM -->
 				<ref bean="org.redline-rpm" />
 				<ref bean="org.eclipse.jgit" />
diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index ab29c5d..ca66d74 100644
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -23,7 +23,7 @@
 		</property>
 	</bean>
 
-	<bean id="biz.aQute.bnd" p:sourceCoords="biz.aQute:bnd:1.50.0"
+	<bean id="biz.aQute.bnd" p:sourceCoords="biz.aQute.bnd:biz.aQute.bnd:4.2.0"
 		parent="template.mavenSdk">
 		<property name="license">
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
@@ -31,9 +31,12 @@
 		<property name="bndProperties">
 			<props merge="true">
 				<prop key="Import-Package">
-					org.eclipse.*;resolution:=optional,
+					com.cloudius.*;resolution:=optional,
+					com.google.*;resolution:=optional,
+ 					org.eclipse.*;resolution:=optional,
 					org.apache.tools.ant.*;resolution:=optional,
 					junit.*;resolution:=optional,
+					slf4j.*;resolution:=optional,
 					*
 				</prop>
 			</props>
@@ -54,7 +57,7 @@
 		</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" />
-- 
2.30.2