X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fmisc.xml;h=ce7c174161568b6d47901bca26209dd820b06782;hb=7b5a67651abff02afad4ff5aa1477111990fd437;hp=ed8b0fc0bf97c3c4c2d6949225e4156f4912135f;hpb=d0f7d3693ba40a18cb42491bc7c59858d7d2f385;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index ed8b0fc..ce7c174 100644
--- 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" /> -->
@@ -70,58 +55,102 @@
 
 	<!-- TODO: Rather use the binary provided here: https://github.com/JodaOrg/joda-time/releases 
 		once the archiveMapper can manage tar.gz archives -->
-	<bean id="org.joda.time" p:sourceCoords="joda-time:joda-time:2.6"
+	<bean id="org.joda.time" p:version="2.6.0" 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>
+		<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>
+	<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>
 
-	<!-- SLF4J Factory -->
-	<bean id="template.org.slf4j" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp" />
+	<bean id="org.quartz-scheduler.quartz" p:sourceCoords="org.quartz-scheduler:quartz:jar:2.2.1"
+		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">
+					*;resolution:=optional,
+				</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="org.quartz-scheduler.quartz.jobs" p:sourceCoords="org.quartz-scheduler:quartz-jobs:jar:2.2.1"
+		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">
+					*;resolution:=optional,
+				</prop>
+			</props>
+		</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>
 
 	<flow:flow name="misc/org.slf4j" spec="spec.version">
@@ -134,12 +163,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>