Argeo TP v2.1.6

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

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index ed8b0fc0bf97c3c4c2d6949225e4156f4912135f..dbc5ed663d76bc652d6061700dd502f82de32f32 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -7,21 +7,6 @@
        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">
 
-       <!-- REGISTER -->
-       <bean id="org.aspectj.weaver" parent="template.bndWrapper">
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Import-Package">
-                                       com.bea.jvm;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"
                parent="template.mavenWrapper">
                <property name="license">
@@ -59,7 +44,7 @@
                </property>
        </bean>
 
-       <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.184"
+       <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.185"
                parent="template.mavenWrapper">
                <property name="doNotModify" value="true" />
                <!-- <property name="doNotModifySources" value="true" /> -->
@@ -72,56 +57,56 @@
                once the archiveMapper can manage tar.gz archives -->
        <bean id="org.joda.time" p:sourceCoords="joda-time:joda-time:2.6"
                parent="template.mavenWrapper">
-               <property name="doNotModify" value="true" />
+               <!-- <property name="doNotModify" value="true" /> -->
                <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.joda.convert.*;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
        </bean>
 
-       <!--  Needed by jsch: it is defined as optional via bnd -->
-       <!--  <bean id="com.jcraft.jzlib" p:sourceCoords="com.jcraft:jzlib:1.1.3"
+       <bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
                </property>
-       </bean> -->
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       com.jcraft.jzlib;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
 
-       <bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
+       <bean id="org.aspectj.weaver" p:sourceCoords="org.aspectj:aspectjweaver:jar:1.7.4"
                parent="template.mavenWrapper">
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
                </property>
                <property name="bndProperties">
                        <props merge="true">
                                <prop key="Import-Package">
-                                       com.jcraft.jzlib;resolution:=optional,
+                                       com.bea.jvm;resolution:=optional,
                                        *
                                </prop>
                        </props>
                </property>
        </bean>
 
-       <!-- AspectJ Factory -->
-       <flow:flow name="misc/org.aspectj" spec="spec.version">
-               <flow:arg name="version" value="1.7.3" />
-               <bean parent="template.archiveWrapper">
-                       <property name="uri"
-                               value="http://www.eclipse.org/downloads/tools/aspectj/aspectj-@{version}.jar" />
-                       <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-                       </property>
-                       <property name="wrappers">
-                               <map>
-                                       <entry key="lib/aspectjweaver.jar" value-ref="org.aspectj.weaver" />
-                               </map>
-                       </property>
-               </bean>
-       </flow:flow>
-
-       <!-- SLF4J Factory -->
-       <bean id="template.org.slf4j" parent="template.bndWrapper"
-               abstract="true">
-               <property name="groupId" value="org.argeo.tp" />
+       <bean id="org.objectweb.asm" p:version="3.1.0"
+               p:sourceCoords="org.eclipse.jetty.orbit:org.objectweb.asm:3.1.0.v200803061910"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+               </property>
        </bean>
 
        <flow:flow name="misc/org.slf4j" spec="spec.version">
@@ -134,12 +119,15 @@
                        </property>
                        <property name="wrappers">
                                <map>
-                                       <entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar"
-                                               value-ref="org.slf4j.log4j12" />
-                                       <entry key="slf4j-@{version}/slf4j-api-@{version}.jar"
-                                               value-ref="org.slf4j.api" />
-                                       <entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar"
-                                               value-ref="org.slf4j.commons.logging" />
+                                       <entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar">
+                                               <bean id="org.slf4j.log4j12" parent="template.bndWrapper" />
+                                       </entry>
+                                       <entry key="slf4j-@{version}/slf4j-api-@{version}.jar">
+                                               <bean id="org.slf4j.api" parent="template.bndWrapper" />
+                                       </entry>
+                                       <entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar">
+                                               <bean id="org.slf4j.commons.logging" parent="template.bndWrapper" />
+                                       </entry>
                                </map>
                        </property>
                </bean>