X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.xml;h=1ae55ce7d055ec97f2b08fa781bf3beb7dec27dd;hb=b5802ca4cfd6bdbb00b3e7ce1b184d3309ff1931;hp=5a0d84d6c09c6906758027e88002af2de21965eb;hpb=889e8ca3ade6deccd42daad263afd7065227d3f0;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 5a0d84d..1ae55ce 100644
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -14,7 +14,7 @@
 	</flow:flow>
 
 	<flow:flow name="apache/org.apache.tika" spec="spec.version">
-		<flow:arg name="version" value="1.10" />
+		<flow:arg name="version" value="1.16" />
 		<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"
@@ -65,15 +65,90 @@
 	</flow:flow>
 
 	<flow:flow name="apache/org.apache.pdfbox" spec="spec.version">
-		<flow:arg name="version" value="1.8.8" />
+		<flow:arg name="version" value="2.0.3" />
 		<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.jempbox" parent="template.apacheMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.pdfbox:jempbox:@{version}" />
 	</flow:flow>
 
+	<flow:flow name="apache/org.apache.batik" spec="spec.version">
+		<flow:arg name="version" value="1.9.1" />
+<!-- 		<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.i18n" parent="template.apacheMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
+		<bean id="org.apache.batik.util" parent="template.apacheMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-util:jar:@{version}" />
+		<bean id="org.apache.batik.css" parent="template.apacheMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
+	</flow:flow>
+
+	<flow:flow name="apache/org.apache.xmlgraphics" spec="spec.version">
+		<flow:arg name="version" value="2.2.0" />
+		<bean id="org.apache.xmlgraphics.commons" parent="template.apacheMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:2.2" />
+	</flow:flow>
+
+	<flow:flow name="apache/org.apache.httpcomponents.httpclient"
+		spec="spec.version">
+		<flow:arg name="version" value="4.5.3" />
+		<bean parent="template.archiveWrapper">
+			<property name="version" value="@{version}" />
+			<property name="license">
+				<util:constant 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" />
+			<property name="includes">
+				<map>
+					<entry
+						key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
+						value="org.argeo.tp.apache" />
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/httpcomponents/httpclient/source/httpcomponents-client-@{version}-src.zip" />
+					<property name="base"
+						value="httpcomponents-client-@{version}/httpclient/src/main/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<flow:flow name="apache/org.apache.httpcomponents.httpcore"
+		spec="spec.version">
+		<flow:arg name="version" value="4.4.6" />
+		<bean parent="template.archiveWrapper">
+			<property name="version" value="@{version}" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="uri"
+				value="http://archive.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-@{version}-osgi-bin.zip" />
+			<property name="includes">
+				<map>
+					<entry
+						key="httpcomponents-core-@{version}/org.apache.httpcomponents.httpcore_@{version}.jar"
+						value="org.argeo.tp.apache" />
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-@{version}-src.zip" />
+					<property name="base"
+						value="httpcomponents-core-@{version}/httpcore/src/main/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+
 	<!-- Templates -->
 	<bean id="template.apacheMaven" parent="template.mavenWrapper"
 		abstract="true">
@@ -87,5 +162,8 @@
 		abstract="true">
 		<property name="version" value="@{version}.0" />
 		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
 	</bean>
 </beans>
\ No newline at end of file