Changeset 35523 in osm for applications/editors

Timestamp:

2020-08-19T21:00:00+02:00 (4 years ago)

Author:

stoecker

Message:

improve ivy support, see #19562

Location:

applications/editors/josm/plugins/apache-http

Files:

• .classpath (modified) (1 diff)
• .project (modified) (1 diff)
• build.xml (modified) (3 diffs)
• ivy.xml (added)
• lib (modified) (1 prop)
• lib/httpclient-4.5.6.jar (deleted)
• lib/httpcore-4.4.10.jar (deleted)
• lib/httpmime-4.5.6.jar (deleted)

applications/editors/josm/plugins/apache-http/.classpath

@@ -4 +4 @@
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM-apache-http&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
-        <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.6.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.10.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.6.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/apache-http/.project

@@ -25 +25 @@
                 <nature>org.eclipse.jdt.core.javanature</nature>
                 <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+                <nature>org.apache.ivyde.eclipse.ivynature</nature>
         </natures>
 </projectDescription>

applications/editors/josm/plugins/apache-http/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="apache-http" default="dist" basedir=".">
+<project name="apache-http" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
@@ -11 +11 @@
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.http.HttpPlugin"/>
     <property name="plugin.description" value="Provides Apache HTTP library. Not meant to be installed directly by users, but rather as a dependency for other plugins."/>
-    
-        <property name="josm" location="../../core/dist/josm-custom.jar"/>
-        <property name="plugin.dist.dir" value="../../dist"/>
+
     <property name="plugin.requires" value="apache-commons;jna"/>
     <property name="plugin.stage" value="15"/>
@@ -20 +18 @@
     <import file="../build-common.xml"/>
 
+    <target name="resolve" description="--> retrieve dependencies with Ivy">
+        <ivy:retrieve/>
+    </target>
+
+    <target name="dist" depends="resolve,plugin_common.dist"/>
+
 </project>