Merge TP extras

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

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 313da4085e4d1f5da84ed66ae355ca9389ccb6d2..2888c3e55ec02056cc0824bf1f4df613bae47daa 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -14,22 +14,6 @@
                </property>
        </bean>
 
-       <bean id="org.junit" p:version="4.11.0" p:sourceCoords="junit:junit:4.11"
-               parent="template.mavenWrapper">
-               <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,
-                                       org.hamcrest.core;resolution:=optional,
-                                       *
-                               </prop>
-                       </props>
-               </property>
-       </bean>
-
        <bean id="EDU.oswego.cs.dl.util.concurrent" p:sourceCoords="concurrent:concurrent:1.3.4"
                parent="template.mavenWrapper">
                <property name="license">
@@ -136,23 +120,6 @@
                </property>
        </bean>
 
-       <bean id="biz.aQute.bnd" p:sourceCoords="biz.aQute:bnd:1.50.0"
-               parent="template.mavenWrapper">
-               <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-               </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>
-       </bean>
-
        <bean id="bitronix.tm" p:sourceCoords="org.codehaus.btm:btm:2.1.4"
                parent="template.mavenWrapper">
                <property name="license">
@@ -243,4 +210,19 @@
                </bean>
        </flow:flow>
 
+       <bean id="net.sf.jxl" p:sourceCoords="net.sourceforge.jexcelapi:jxl:2.6.12"
+               parent="template.mavenWrapper">
+               <!-- <property name="doNotModify" value="true" /> -->
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
+               </property>
+       </bean>
+
+       <bean id="org.postgresql.postgresql" p:sourceCoords="org.postgresql:postgresql:9.3-1102-jdbc41"
+               p:version="9.3.1102.jdbc41" parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+               </property>
+       </bean>
+
 </beans>
\ No newline at end of file