X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.xml;h=001d6d372a4852ba5e634f11f380e6efbe3bcc26;hb=aa5b1ad913de3cbb33e60804388ba21b5df45734;hp=ae9126386a7ac38e3e99ccbf772f273ec2eb65b6;hpb=f04662d61d775f8cff682ed9e07b8c7c802e3c70;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index ae91263..001d6d3 100644
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -18,7 +18,7 @@
 	</flow:flow>
 
 	<flow:flow name="apache/org.apache.tika" spec="spec.version">
-		<flow:arg name="version" value="1.19" />
+		<flow:arg name="version" value="1.22" />
 		<bean id="org.apache.tika.core" parent="template.tikaMaven"
 			p:sourceCoords="org.apache.tika:tika-core:@{version}">
 			<property name="doNotModify" value="true" />
@@ -54,17 +54,53 @@
 	</bean>
 
 	<bean id="org.apache.mina.core"
-		p:sourceCoords="org.apache.mina:mina-core:2.0.19"
+		p:sourceCoords="org.apache.mina:mina-core:2.0.21"
 		parent="template.apacheMaven">
 		<property name="doNotModify" value="true" />
 	</bean>
 
-	<bean id="org.apache.sshd.core"
-		p:sourceCoords="org.apache.sshd:sshd-core:2.0.0"
+	<!-- Needed by Apache SSHD in order to integrate with Unix agent -->
+	<bean id="org.apache.tomcat.jni"
+		p:sourceCoords="org.apache.tomcat:tomcat-jni:9.0.26"
 		parent="template.apacheMaven">
-		<property name="doNotModify" value="true" />
 	</bean>
 
+	<flow:flow name="apache/org.apache.sshd" spec="spec.version">
+		<flow:arg name="version" value="2.3.0" />
+		<bean id="org.apache.sshd.core"
+			p:sourceCoords="org.apache.sshd:sshd-core:@{version}"
+			p:doNotModify="true" parent="template.apacheMaven" />
+		<bean id="org.apache.sshd.common"
+			p:sourceCoords="org.apache.sshd:sshd-common:@{version}"
+			parent="template.apacheMaven">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Fragment-Host">org.apache.sshd.core</prop>
+					<prop key="Import-Package">
+						org.bouncycastle.jce.provider;resolution:=optional,
+						net.i2p.crypto.eddsa;resolution:=optional,
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
+		<bean id="org.apache.sshd.sftp"
+			p:sourceCoords="org.apache.sshd:sshd-sftp:@{version}"
+			p:doNotModify="true" parent="template.apacheMaven" />
+		<bean id="org.apache.sshd.cli"
+			p:sourceCoords="org.apache.sshd:sshd-cli:@{version}"
+			p:doNotModify="true" parent="template.apacheMaven" />
+		<bean id="org.apache.sshd.scp"
+			p:sourceCoords="org.apache.sshd:sshd-scp:@{version}"
+			p:doNotModify="true" parent="template.apacheMaven" />
+		<bean id="org.apache.sshd.putty"
+			p:sourceCoords="org.apache.sshd:sshd-putty:@{version}"
+			p:doNotModify="true" parent="template.apacheMaven" />
+		<bean id="org.apache.sshd.git"
+			p:sourceCoords="org.apache.sshd:sshd-git:@{version}"
+			p:doNotModify="true" parent="template.apacheMaven" />
+	</flow:flow>
+
 	<!-- Log4j12 Factory -->
 	<flow:flow name="apache/org.apache.log4j" spec="spec.version">
 		<flow:arg name="version" value="1.2.17" />
@@ -95,7 +131,7 @@
 
 	<flow:flow name="apache/org.apache.pdfbox"
 		spec="spec.version">
-		<flow:arg name="version" value="2.0.2" />
+		<flow:arg name="version" value="2.0.17" />
 		<bean id="org.apache.pdfbox" parent="template.apacheMaven"
 			p:version="@{version}"
 			p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
@@ -112,7 +148,7 @@
 	</flow:flow>
 
 	<flow:flow name="apache/org.apache.poi" spec="spec.version">
-		<flow:arg name="version" value="4.0.0" />
+		<flow:arg name="version" value="4.1.1" />
 		<!-- <bean id="org.apache.poi" parent="template.apacheMaven" -->
 		<!-- p:version="@{version}" -->
 		<!-- p:sourceCoords="org.apache.servicemix.bundles:org.apache.servicemix.bundles.poi:@{version}_1"> -->
@@ -127,8 +163,10 @@
 				<props merge="true">
 					<!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
 					<prop key="Import-Package">
+						com.graphbuilder.*;resolution:=optional,
 						com.graphbuilder.*;resolution:=optional,
 						org.etsi.uri.*;resolution:=optional,
+						org.apache.batik.*;resolution:=optional,
 						*
 					</prop>
 				</props>
@@ -165,12 +203,14 @@
 	</flow:flow>
 
 	<bean id="org.apache.xmlbeans"
-		p:sourceCoords="org.apache.xmlbeans:xmlbeans:3.0.1"
+		p:sourceCoords="org.apache.xmlbeans:xmlbeans:3.1.0"
 		parent="template.apacheMaven">
 		<property name="bndProperties">
 			<props merge="true">
 				<prop key="DynamicImport-Package">*</prop>
 				<prop key="Import-Package">
+					org.apache.tools.ant.*;resolution:=optional,
+					net.sf.saxon.*;resolution:=optional,
 					com.sun.*;resolution:=optional,
 					*
 				</prop>
@@ -205,10 +245,13 @@
 		parent="template.apacheMaven" />
 
 	<flow:flow name="apache/org.apache.batik" spec="spec.version">
-		<flow:arg name="version" value="1.10" />
+		<flow:arg name="version" value="1.12" />
 		<!-- <bean id="org.apache.batik.ext" parent="template.apacheMaven" -->
 		<!-- p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-ext:jar:@{version}" 
 			/> -->
+		<bean id="org.apache.batik.constants" parent="template.apacheMaven"
+			p:version="@{version}.0"
+			p:sourceCoords="org.apache.xmlgraphics:batik-constants:jar:@{version}" />
 		<bean id="org.apache.batik.i18n" parent="template.apacheMaven"
 			p:version="@{version}.0"
 			p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
@@ -218,11 +261,14 @@
 		<bean id="org.apache.batik.css" parent="template.apacheMaven"
 			p:version="@{version}.0"
 			p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
+		<bean id="org.apache.batik.anim" parent="template.apacheMaven"
+			p:version="@{version}.0"
+			p:sourceCoords="org.apache.xmlgraphics:batik-anim:jar:@{version}" />
 	</flow:flow>
 
 	<flow:flow name="apache/org.apache.xmlgraphics"
 		spec="spec.version">
-		<flow:arg name="version" value="2.3" />
+		<flow:arg name="version" value="2.4" />
 		<bean id="org.apache.xmlgraphics.commons"
 			parent="template.apacheMaven" p:version="@{version}.0"
 			p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:@{version}" />
@@ -231,7 +277,7 @@
 
 	<flow:flow name="apache/org.apache.httpcomponents.httpclient"
 		spec="spec.version">
-		<flow:arg name="version" value="4.5.6" />
+		<flow:arg name="version" value="4.5.9" />
 		<bean parent="template.archiveWrapper">
 			<property name="version" value="@{version}" />
 			<property name="license">
@@ -239,11 +285,11 @@
 					static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 			</property>
 			<property name="uri"
-				value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
+				value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-bin.zip" />
 			<property name="includes">
 				<map>
 					<entry
-						key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
+						key="httpcomponents-client-@{version}/lib/httpclient-osgi-@{version}.jar"
 						value="org.argeo.tp.apache" />
 				</map>
 			</property>
@@ -289,6 +335,11 @@
 		</bean>
 	</flow:flow>
 
+	<bean id="org.apache.aries.util" parent="template.ariesMaven"
+		p:sourceCoords="org.apache.aries:org.apache.aries.util:1.1.3" />
+	<bean id="org.apache.aries.spifly.dynamic.bundle"
+		parent="template.ariesMaven"
+		p:sourceCoords="org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.2.1" />
 
 	<!-- Templates -->
 	<bean id="template.apacheMaven" parent="template.mavenWrapper"
@@ -309,4 +360,14 @@
 				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
 	</bean>
+
+	<bean id="template.ariesMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.apache" />
+		<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