Add jsch and joda-time for maven central in the base distribution.

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

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 08207c8dd320f3335b630f29200fe8dd3705b985..148be0c794b4c4f870b467354997f1c343de19a1 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -12,71 +12,79 @@
                <property name="bndProperties">
                        <props merge="true">
                                <prop key="Import-Package">
-                                       *,
                                        com.bea.jvm;resolution:=optional,
+                                       *
                                </prop>
                        </props>
                </property>
        </bean>
-       <bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
-               parent="template.bndWrapper">
+       <bean id="org.slf4j.log4j12" parent="template.org.slf4j" />
+       <bean id="org.slf4j.api" parent="template.org.slf4j" />
+       <bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
+
+       <bean id="org.aopalliance" p:version="1.0.0" p:sourceCoords="aopalliance:aopalliance:1.0"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
+               </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">
-                                       *,
-                                       com.ibm.uvm.tools;resolution:=optional,
-                                       com.sun.jdmk.comm;resolution:=optional,
-                                       javax.jmdns;resolution:=optional,
-                                       javax.jms;resolution:=optional,
-                                       javax.mail;resolution:=optional,
-                                       javax.mail.internet;resolution:=optional,
+                                       org.hamcrest;resolution:=optional,
+                                       org.hamcrest.core;resolution:=optional,
+                                       *
                                </prop>
                        </props>
                </property>
        </bean>
-       <bean id="org.slf4j.log4j12" parent="template.org.slf4j" />
-       <bean id="org.slf4j.api" parent="template.org.slf4j" />
-       <bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
 
-       <bean id="org.aopalliance" p:version="1.0.0" p:sourceCoords="aopalliance:aopalliance:1.0"
+       <bean id="EDU.oswego.cs.dl.util.concurrent" p:sourceCoords="concurrent:concurrent:1.3.4"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
                </property>
        </bean>
 
-       <bean id="org.junit" p:version="4.11.0" p:sourceCoords="junit:junit:4.11"
+       <bean id="org.openid4java" p:sourceCoords="org.openid4java:openid4java:0.9.8"
                parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </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>
 
-       <!-- Log4j12 Factory -->
-       <flow:flow name="misc/org.apache.log4j" spec="spec.version">
-               <flow:arg name="version" value="1.2.17" />
-               <bean parent="template.archiveWrapper">
-                       <property name="uri"
-                               value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-                       <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-                       </property>
-                       <property name="wrappers">
-                               <map>
-                                       <entry key="apache-log4j-@{version}/log4j-@{version}.jar"
-                                               value-ref="org.apache.log4j" />
-                               </map>
-                       </property>
-                       <property name="sourcesProvider">
-                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-                                       <property name="uri"
-                                               value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-                                       <property name="base" value="apache-log4j-@{version}/src/main/java/" />
-                                       <property name="osgiFactory" ref="osgiFactory" />
-                               </bean>
-                       </property>
-               </bean>
-       </flow:flow>
+       <!-- TODO: Rather use the binary provided here: https://github.com/JodaOrg/joda-time/releases 
+               once the archiveMapper can manage tar.gz archives -->
+       <bean id="joda-time" p:sourceCoords="joda-time:joda-time:2.6"
+               parent="template.mavenWrapper">
+               <property name="doNotModify" value="true" />
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+       </bean>
+
+       <bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
+               parent="template.mavenWrapper">
+               <!--  <property name="doNotModify" value="true" />  -->
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+               </property>
+       </bean>
 
        <!-- AspectJ Factory -->
        <flow:flow name="misc/org.aspectj" spec="spec.version">
@@ -121,5 +129,4 @@
                        </property>
                </bean>
        </flow:flow>
-
 </beans>
\ No newline at end of file