X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.xml;h=0a6d3c2424a306fc26c49ca91c7ae5b7a8ade6cc;hb=8374554ca9c5d1be766159674729c074b3037308;hp=7bb6573de3ecbf79d773a8c3f005f14bd7447f41;hpb=859f548d8fdff7ff0171cd351836b256c4503cc1;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 7bb6573..0a6d3c2 100644
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -20,9 +20,20 @@
 	<flow:flow name="apache/org.apache.tika" spec="spec.version">
 		<flow:arg name="version" value="1.19" />
 		<bean id="org.apache.tika.core" parent="template.tikaMaven"
-			p:sourceCoords="org.apache.tika:tika-core:@{version}" />
-		<bean id="org.apache.tika.parser" parent="template.tikaMaven"
-			p:sourceCoords="org.apache.tika:tika-parsers:@{version}" />
+			p:sourceCoords="org.apache.tika:tika-core:@{version}">
+			<property name="doNotModify" value="true" />
+		</bean>
+		<bean id="org.apache.tika.parsers" parent="template.tikaMaven"
+			p:sourceCoords="org.apache.tika:tika-parsers:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Bundle-Activator">org.apache.tika.parser.internal.Activator</prop>
+					<prop key="Import-Package">
+						*;resolution:=optional
+					</prop>
+				</props>
+			</property>
+		</bean>
 	</flow:flow>
 
 	<bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
@@ -43,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.20"
 		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.17"
 		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.2.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" />
@@ -84,17 +131,29 @@
 
 	<flow:flow name="apache/org.apache.pdfbox"
 		spec="spec.version">
-		<flow:arg name="version" value="2.0.3" />
+		<flow:arg name="version" value="2.0.2" />
 		<bean id="org.apache.pdfbox" parent="template.apacheMaven"
 			p:version="@{version}"
 			p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
 		<bean id="org.apache.pdfbox.fontbox"
 			parent="template.apacheMaven" p:version="@{version}"
 			p:sourceCoords="org.apache.pdfbox:fontbox:@{version}" />
+		<bean id="org.apache.pdfbox.xmpbox" parent="template.apacheMaven"
+			p:version="@{version}"
+			p:sourceCoords="org.apache.pdfbox:xmpbox:@{version}" />
+		<!-- Legacy, still used by Tika -->
+		<bean id="org.apache.pdfbox.jempbox"
+			parent="template.apacheMaven" p:version="@{version}"
+			p:sourceCoords="org.apache.pdfbox:jempbox:1.8.2" />
 	</flow:flow>
 
 	<flow:flow name="apache/org.apache.poi" spec="spec.version">
 		<flow:arg name="version" value="4.0.0" />
+		<!-- <bean id="org.apache.poi" parent="template.apacheMaven" -->
+		<!-- p:version="@{version}" -->
+		<!-- p:sourceCoords="org.apache.servicemix.bundles:org.apache.servicemix.bundles.poi:@{version}_1"> -->
+		<!-- <property name="doNotModify" value="true" /> -->
+		<!-- </bean> -->
 		<bean id="org.apache.poi" parent="template.apacheMaven"
 			p:version="@{version}" p:sourceCoords="org.apache.poi:poi:@{version}" />
 		<bean id="org.apache.poi.ooxml" parent="template.apacheMaven"
@@ -102,6 +161,7 @@
 			p:sourceCoords="org.apache.poi:poi-ooxml:@{version}">
 			<property name="bndProperties">
 				<props merge="true">
+					<!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
 					<prop key="Import-Package">
 						com.graphbuilder.*;resolution:=optional,
 						org.etsi.uri.*;resolution:=optional,
@@ -116,17 +176,28 @@
 			p:sourceCoords="org.apache.poi:poi-ooxml-schemas:@{version}">
 			<property name="bndProperties">
 				<props merge="true">
+					<!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
 					<prop key="Import-Package">
 						com.microsoft.schemas.*;resolution:=optional,
 						org.openxmlformats.schemas.*;resolution:=optional,
 						*
 					</prop>
+					<prop key="Require-Bundle">org.apache.xmlbeans</prop>
 				</props>
 			</property>
 		</bean>
 		<bean id="org.apache.poi.scratchpad"
 			parent="template.apacheMaven" p:version="@{version}"
-			p:sourceCoords="org.apache.poi:poi-scratchpad:@{version}" />
+			p:sourceCoords="org.apache.poi:poi-scratchpad:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
+					<prop key="Import-Package">
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
 	</flow:flow>
 
 	<bean id="org.apache.xmlbeans"
@@ -134,6 +205,7 @@
 		parent="template.apacheMaven">
 		<property name="bndProperties">
 			<props merge="true">
+				<prop key="DynamicImport-Package">*</prop>
 				<prop key="Import-Package">
 					com.sun.*;resolution:=optional,
 					*
@@ -253,6 +325,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"
@@ -267,10 +344,20 @@
 	<bean id="template.tikaMaven" parent="template.apacheMaven"
 		abstract="true">
 		<property name="version" value="@{version}.0" />
-		<property name="doNotModify" value="true" />
+		<!-- <property name="doNotModify" value="true" /> -->
 		<property name="license">
 			<util:constant
 				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