X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fmisc.xml;h=0f887abfe3e9ac2d8e46c28afe4be0f34fd4c71e;hb=ecdf6175f8e4890303ca422102d461a1c2887cbd;hp=90fcd4128c1c8a6631a1be33b8345b4597e6052d;hpb=e3deb55aef36868ee95f2a8b349d878d23a357ba;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 90fcd41..0f887ab 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -1,48 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:flow="http://www.argeo.org/schema/slc-flow"
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	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">
 
-	<bean id="org.aopalliance" p:version="1.0.0" p:sourceCoords="aopalliance:aopalliance:1.0"
+	<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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
 		</property>
 	</bean>
 
-	<bean id="EDU.oswego.cs.dl.util.concurrent" p:sourceCoords="concurrent:concurrent:1.3.4"
+	<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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
 		</property>
 	</bean>
 
-	<bean id="org.openid4java" p:sourceCoords="org.openid4java:openid4java:0.9.8"
+	<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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
 
-	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.188"
+	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.199"
 		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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.EPL" />
 		</property>
 	</bean>
 
 	<!-- 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:version="2.6.0" 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="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -57,7 +68,8 @@
 	<bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.54"
 		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.BSD" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -69,10 +81,12 @@
 		</property>
 	</bean>
 
-	<bean id="org.aspectj.weaver" p:sourceCoords="org.aspectj:aspectjweaver:jar:1.7.4"
+	<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.EPL" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.EPL" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -88,14 +102,25 @@
 		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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.BSD" />
 		</property>
 	</bean>
+	<!-- <bean id="org.objectweb.asm" p:doNotModify="true" -->
+	<!-- p:sourceCoords="org.ow2.asm:asm-all:5.0.4" -->
+	<!-- parent="template.mavenWrapper"> -->
+	<!-- <property name="license"> -->
+	<!-- <util:constant -->
+	<!-- static-field="org.argeo.slc.repo.FreeLicense.BSD" /> -->
+	<!-- </property> -->
+	<!-- </bean> -->
 
-	<bean id="org.quartz-scheduler.quartz" p:sourceCoords="org.quartz-scheduler:quartz:jar:2.2.1"
+	<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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -106,10 +131,12 @@
 		</property>
 	</bean>
 
-	<bean id="org.quartz-scheduler.quartz.jobs" p:sourceCoords="org.quartz-scheduler:quartz-jobs:jar:2.2.1"
+	<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" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -123,7 +150,8 @@
 	<bean id="bitronix.tm" p:sourceCoords="org.codehaus.btm:btm:2.1.4"
 		parent="template.mavenWrapper">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -136,18 +164,24 @@
 		</property>
 	</bean>
 
-	<bean id="com.google.guava" p:sourceCoords="com.google.guava:guava:jar:23.0"
+	<bean id="com.google.guava"
+		p:sourceCoords="com.google.guava:guava:jar:26.0-jre"
 		parent="template.mavenWrapper">
+		<property name="version" value="26.0.0" />
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="doNotModify" value="true" />
 	</bean>
 
-	<bean id="com.google.gson" p:sourceCoords="com.google.code.gson:gson:jar:2.8.1"
+	<!-- Gson v2.8.6 requires Java 9 -->
+	<bean id="com.google.gson"
+		p:sourceCoords="com.google.code.gson:gson:jar:2.8.5"
 		parent="template.mavenWrapper">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="doNotModify" value="true" />
 	</bean>
@@ -159,30 +193,85 @@
 	<!-- </property> -->
 	<!-- </bean> -->
 
+	<!-- <flow:flow name="misc/org.slf4j" spec="spec.version"> -->
+	<!-- <flow:arg name="version" value="1.7.5" /> -->
+	<!-- <bean parent="template.archiveWrapper"> -->
+	<!-- <property name="uri" -->
+	<!-- value="http://www.slf4j.org/dist/slf4j-@{version}.zip" /> -->
+	<!-- <property name="license"> -->
+	<!-- <util:constant -->
+	<!-- static-field="org.argeo.slc.repo.FreeLicense.MIT" /> -->
+	<!-- </property> -->
+	<!-- <property name="wrappers"> -->
+	<!-- <map> -->
+	<!-- <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> -->
+	<!-- </flow:flow> -->
+
 	<flow:flow name="misc/org.slf4j" spec="spec.version">
-		<flow:arg name="version" value="1.7.5" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
+		<flow:arg name="version" value="1.7.28" />
+		<bean id="org.slf4j.api" parent="template.mavenWrapper"
+			p:sourceCoords="org.slf4j:slf4j-api:@{version}">
+			<property name="license">
+				<util:constant
+					static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+		</bean>
+		<bean id="org.slf4j.log4j12" parent="template.mavenWrapper"
+			p:sourceCoords="org.slf4j:slf4j-log4j12:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Export-Package">org.slf4j.impl</prop>
+				</props>
+			</property>
+			<property name="license">
+				<util:constant
+					static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+		</bean>
+		<bean id="org.slf4j.commons.logging"
+			parent="template.mavenWrapper"
+			p:sourceCoords="org.slf4j:jcl-over-slf4j:@{version}">
 			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+				<util:constant
+					static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 			</property>
-			<property name="wrappers">
-				<map>
-					<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>
+		</bean>
+		<bean id="org.slf4j.osgi.service.log"
+			parent="template.mavenWrapper"
+			p:sourceCoords="org.slf4j:osgi-over-slf4j:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Bundle-Activator">org.slf4j.osgi.logservice.impl.Activator</prop>
+				</props>
+			</property>
+			<property name="license">
+				<util:constant
+					static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 			</property>
 		</bean>
 	</flow:flow>
 
+	<bean id="slf4j.osgi" p:sourceCoords="org.osgi:slf4j.osgi:1.7.0"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+		<property name="doNotModify" value="true" />
+	</bean>
+
 	<!-- <flow:flow name="misc/org.w3c.css.sac" spec="spec.version"> -->
 	<!-- <flow:arg name="version" value="1.3" /> -->
 	<!-- <bean parent="template.archiveWrapper"> -->
@@ -209,26 +298,31 @@
 	<!-- </flow:flow> -->
 
 	<!-- JGit -->
-	<bean id="com.googlecode.javaewah.JavaEWAH" p:sourceCoords="com.googlecode.javaewah:JavaEWAH:1.1.6"
+	<bean id="com.googlecode.javaewah.JavaEWAH"
+		p:sourceCoords="com.googlecode.javaewah:JavaEWAH:1.1.6"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
-	<bean id="org.eclipse.jgit" p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:4.8.0.201706111038-r"
+	<bean id="org.eclipse.jgit"
+		p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
 		<property name="license">
 			<!-- Eclipse Distribution License (EDL) -->
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.BSD" />
 		</property>
 	</bean>
 
-	<bean id="org.w3c.dom.svg" parent="template.mavenWrapper" p:version="1.3.4"
-		p:sourceCoords="xml-apis:xml-apis-ext:1.3.04">
+	<bean id="org.w3c.dom.svg" parent="template.mavenWrapper"
+		p:version="1.3.4" p:sourceCoords="xml-apis:xml-apis-ext:1.3.04">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 		<property name="bndProperties">
 			<props merge="true">
@@ -239,28 +333,123 @@
 		</property>
 	</bean>
 
-	<bean id="net.sf.jxl" p:sourceCoords="net.sourceforge.jexcelapi:jxl:2.6.12"
+	<bean id="net.sf.jxl"
+		p:sourceCoords="net.sourceforge.jexcelapi:jxl:2.6.12"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
+		</property>
+	</bean>
+
+	<bean id="org.tukaani.xz" p:sourceCoords="org.tukaani:xz:1.8"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
+		</property>
+	</bean>
+
+	<!-- Required by Apache SSHD PuTTY -->
+	<bean id="net.i2p.crypto.eddsa"
+		p:sourceCoords="net.i2p.crypto:eddsa:0.3.0"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
+		</property>
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					sun.security.x509;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<flow:flow name="misc/com.vladsch.flexmark"
+		spec="spec.version">
+		<flow:arg name="version" value="0.50.40" />
+		<bean id="com.vladsch.flexmark"
+			p:sourceCoords="com.vladsch.flexmark:flexmark:@{version}"
+			parent="template.mavenWrapperBSD">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Import-Package">
+						sun.misc;resolution:=optional,
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
+		<bean id="com.vladsch.flexmark.util"
+			p:sourceCoords="com.vladsch.flexmark:flexmark-util:@{version}"
+			parent="template.mavenWrapperBSD">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Import-Package">
+						sun.misc;resolution:=optional,
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
+		<bean id="com.vladsch.flexmark.formatter"
+			p:sourceCoords="com.vladsch.flexmark:flexmark-formatter:@{version}"
+			parent="template.mavenWrapperBSD" />
+		<bean id="com.vladsch.flexmark.ext.tables"
+			p:sourceCoords="com.vladsch.flexmark:flexmark-ext-tables:@{version}"
+			parent="template.mavenWrapperBSD" />
+		<bean id="com.vladsch.flexmark.ext.escaped_character"
+			p:sourceCoords="com.vladsch.flexmark:flexmark-ext-escaped-character:@{version}"
+			parent="template.mavenWrapperBSD" />
+	</flow:flow>
+
+	<bean id="org.jsoup" p:sourceCoords="org.jsoup:jsoup:1.2.1"
 		parent="template.mavenWrapper">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.MIT" />
 		</property>
+		<!-- <property name="doNotModify" value="true" /> -->
 	</bean>
 
-	<bean id="org.postgresql.jdbc42" p:sourceCoords="org.postgresql:postgresql:42.1.4"
+	<bean id="org.freemarker"
+		p:sourceCoords="org.freemarker:freemarker:2.3.29"
+		parent="template.mavenWrapperApacheLicense">
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="org.postgresql.jdbc42"
+		p:sourceCoords="org.postgresql:postgresql:42.2.8"
 		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.BSD" />
 		</property>
 		<property name="doNotModify" value="true" />
-		<!-- <property name="bndProperties"> -->
-		<!-- <props merge="true"> -->
-		<!-- <prop key="Import-Package"> -->
-		<!-- com.sun.jna.*;resolution:=optional, -->
-		<!-- waffle.*;resolution:=optional, -->
-		<!-- * -->
-		<!-- </prop> -->
-		<!-- </props> -->
-		<!-- </property> -->
 	</bean>
 
+	<!-- <bean id="org.atmosphere.runtime" -->
+	<!-- p:sourceCoords="org.atmosphere:atmosphere-runtime:2.4.32" -->
+	<!-- parent="template.mavenWrapper"> -->
+	<!-- <property name="license"> -->
+	<!-- <util:constant -->
+	<!-- static-field="org.argeo.slc.repo.FreeLicense.APACHE" /> -->
+	<!-- </property> -->
+	<!-- <property name="doNotModify" value="true" /> -->
+	<!-- </bean> -->
+
+	<!-- <bean id="org.atmosphere.socketio" -->
+	<!-- p:sourceCoords="org.atmosphere:atmosphere-socketio:2.4.21" -->
+	<!-- parent="template.mavenWrapper"> -->
+	<!-- <property name="license"> -->
+	<!-- <util:constant -->
+	<!-- static-field="org.argeo.slc.repo.FreeLicense.APACHE" /> -->
+	<!-- </property> -->
+	<!-- <property name="doNotModify" value="true" /> -->
+	<!-- </bean> -->
+
+
 </beans>
\ No newline at end of file