Work on Argeo TP v2.1.19

[gpl/argeo-tp.git] / META-INF / spring / apache.commons.xml

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 9276c69b869ce270a81380aa325258542b2e097f..515c4b8ee1eab1bc74ae031b5abd045368d8548a 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -61,6 +61,12 @@
                <bean p:version="1.3.0" parent="template.commonsArchiveWrapper" />
        </flow:flow>
 
+       <flow:flow name="apache/org.apache.commons.jxpath" spec="spec.commons">
+               <flow:arg name="project" value="jxpath" />
+               <flow:arg name="version" value="1.3" />
+               <bean p:version="1.3.0" parent="template.commonsArchiveWrapper" />
+       </flow:flow>
+
        <flow:flow name="apache/org.apache.commons.net" spec="spec.commons">
                <flow:arg name="project" value="net" />
                <flow:arg name="version" value="3.3" />
@@ -233,29 +239,27 @@
                </bean>
        </flow:flow>
 
-       <flow:flow name="apache/org.apache.httpcomponents.httpclient"
-               spec="spec.version">
-               <flow:arg name="version" value="4.4" />
-               <bean parent="template.archiveWrapper">
+       <flow:flow name="apache/org.apache.commons.lang3" spec="spec.commons">
+               <flow:arg name="project" value="lang3" />
+               <flow:arg name="version" value="3.4" />
+               <bean parent="template.commonsArchiveWrapper">
                        <property name="version" value="@{version}.0" />
-                       <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">
+                               value="http://archive.apache.org/dist/commons/lang/binaries/commons-@{project}-@{version}-bin.zip" />
+                       <property name="wrappers">
                                <map>
                                        <entry
-                                               key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
-                                               value="org.argeo.tp.apache" />
+                                               key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+                                               <bean id="org.apache.commons.lang3" parent="template.org.apache.commons" />
+                                       </entry>
                                </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" />
+                                               value="http://archive.apache.org/dist/commons/lang/source/commons-@{project}-@{version}-src.zip" />
                                        <property name="base"
-                                               value="httpcomponents-client-@{version}/httpclient/src/main/java/" />
+                                               value="commons-@{project}-@{version}-src/src/main/java/" />
                                        <property name="osgiFactory" ref="osgiFactory" />
                                </bean>
                        </property>