Improve OSGi packaging

[gpl/argeo-tp.git] / META-INF / spring / misc.xml

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 70af27148a604737140fe24d8232b6574eeea6f8..bb210237aab69564d289b9b4bf3668cb6f2c5721 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -12,8 +12,8 @@
                <property name="bndProperties">
                        <props merge="true">
                                <prop key="Import-Package">
-                                       *,
                                        com.bea.jvm;resolution:=optional,
+                                       *
                                </prop>
                        </props>
                </property>
@@ -34,6 +34,23 @@
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
                </property>
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       org.hamcrest;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+
+       <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.184"
+               parent="template.mavenWrapper">
+               <property name="doNotModify" value="true" />
+               <!-- <property name="doNotModifySources" value="true" /> -->
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+               </property>
        </bean>
 
        <!-- AspectJ Factory -->