Ticket #19562: 19562.apache_http_without_logging.patch

.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <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>

.project

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

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 -->
     <property name="plugin.main.version" value="10580"/>
@@ -10 +10 @@
     <property name="plugin.author" value="Don-vip"/>
     <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"/>
 
@@ -19 +17 @@
     <!-- ** include targets that all plugins have in common ** -->
     <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>

ivy.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- License: GPL. For details, see LICENSE file. -->
+<ivy-module version="2.0">
+    <info organisation="org.openstreetmap" module="josm"/>
+    <configurations>
+        <conf name="ivy" description="Apache Ivy configuration for self-update"/>
+        <!--  configuration that should be used when specifying dependencies -->
+        <conf name="implementation" description="All libs JOSM uses that plugins should not use"/>
+        <conf name="api" description="All libs that JOSM uses and are available for plugins"/>
+        <conf name="runtimeOnly" description="The libs shipped with JOSM that we do not need during compilation"/>
+        <conf name="provided" description="The libs we need during compilation but not on application start"/>
+        <!--  Meta configuration used in build scripts -->
+        <conf name="runtime" description="Libraries only needed at runtime" extends="implementation,api,runtimeOnly"/>
+        <conf name="compile" description="Libraries needed only for compilation" extends="implementation,api,provided"/>
+        <conf name="test" description="Libraries only needed for testing" extends="compile,runtime"/>
+    </configurations>
+    <dependencies>
+        <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.4.13" conf="api->default"/>
+        <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.12" conf="api->default"/>
+        <dependency org="org.apache.httpcomponents" name="httpmime" rev="4.5.12" conf="api->default"/>
+    </dependencies>
+</ivy-module>