Update with Eclipse Oxygen SR2

[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 2ac449eec3d39584b9f1426d524ef328842ddd2c..591cc7570c50792acad5e809779862d336493760 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -61,6 +61,32 @@
                <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">
+                       <property name="wrappers">
+                               <map>
+                                       <entry
+                                               key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+                                               <bean id="org.apache.commons.jxpath" parent="template.org.apache.commons">
+                                                       <property name="bndProperties">
+                                                               <props merge="true">
+                                                                       <prop key="Import-Package">
+                                                                               javax.servlet.jsp.*;resolution:=optional,
+                                                                               org.apache.commons.beanutils.*;resolution:=optional,
+                                                                               org.jdom.*;resolution:=optional,
+                                                                               *
+                                                                       </prop>
+                                                               </props>
+                                                       </property>
+                                               </bean>
+                                       </entry>
+                               </map>
+                       </property>
+               </bean>
+       </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" />
@@ -260,35 +286,6 @@
                </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">
-                       <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">
-                               <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>
-
        <!-- Specs and templates -->
        <flow:spec id="spec.commons">
                <flow:primitive name="version" isParameter="true" />