Changeset 35362 in osm

Timestamp:

2020-03-14T17:20:37+01:00 (5 years ago)

Author:

donvip

Message:

fix #josm18916 - Switch to Apache Ivy, add Commons Math (patch by taylor.smock)

Location:

applications/editors/josm/plugins/apache-commons

Files:

• .classpath (modified) (1 diff)
• .project (modified) (2 diffs)
• .settings/org.eclipse.core.resources.prefs (modified) (1 diff)
• build.xml (modified) (3 diffs)
• ivy.xml (added)
• lib (modified) (1 prop)
• lib/dec-0.1.2-javadoc.jar (deleted)
• lib/dec-0.1.2-sources.jar (deleted)
• lib/dec-0.1.2.jar (deleted)
• lib/xz-1.6-javadoc.jar (deleted)
• lib/xz-1.6-sources.jar (deleted)
• lib/xz-1.6.jar (deleted)
• lib/zstd-jni-1.3.2-2-javadoc.jar (deleted)
• lib/zstd-jni-1.3.2-2-sources.jar (deleted)
• lib/zstd-jni-1.3.2-2.jar (deleted)
• src/org/apache (deleted)

applications/editors/josm/plugins/apache-commons/.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="lib" path="lib/xz-1.6.jar" sourcepath="lib/xz-1.6-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/xz-1.6-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry exported="true" kind="lib" path="lib/dec-0.1.2.jar" sourcepath="lib/dec-0.1.2-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/dec-0.1.2-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry kind="lib" path="lib/zstd-jni-1.3.2-2.jar" sourcepath="lib/zstd-jni-1.3.2-2-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/zstd-jni-1.3.2-2-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
+        <classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM-apache-commons&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -4 +4 @@
         <comment></comment>
         <projects>
+                <project>JOSM</project>
         </projects>
         <buildSpec>
@@ -25 +26 @@
                 <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-commons/.settings/org.eclipse.core.resources.prefs

@@ -1 +1 @@
 eclipse.preferences.version=1
-encoding//src/org/apache/commons/lang3=ISO-8859-1
 encoding/<project>=UTF-8

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="apache-commons" default="dist" basedir=".">
+<project name="apache-commons" 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.commons.CommonsPlugin"/>
     <property name="plugin.description" value="Provides Apache Commons library components. 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=""/>-->
     <property name="plugin.stage" value="10"/>
@@ -22 +20 @@
     <import file="../build-common.xml"/>
 
-    <!--
-    ***************************************************************
-    ** compile_lang3 - compiles Apache Commons Lang 3 (not UTF-8 !)
-    ***************************************************************
-    -->
-    <target name="compile_lang3" depends="init">
-        <echo message="compiling Apache Commons Lang 3 ... "/>
-        <javac srcdir="src" includes="org/apache/commons/lang3/**" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
+    <target name="resolve" description="--> retrieve dependencies with Ivy">
+        <ivy:retrieve/>
     </target>
 
-    <!--
-    **********************************************************
-    ** compile - compiles the source tree
-    **********************************************************
-    -->
-    <target name="compile" depends="compile_lang3">
-        <echo message="compiling sources for ${plugin.jar} ... "/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
-            <exclude name="**/org/apache/commons/lang3/**" />
-            <exclude name="**/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur*.java" />
-            <classpath>
-                <pathelement path="${plugin.build.dir}"/>
-                <path refid="plugin.classpath"/>
-            </classpath>
-        </javac>
-    </target>
-
-        <target name="pre-javadoc">
-        <delete><fileset dir="src" includes="**/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur*.java"/></delete>
-    </target>
+    <target name="dist" depends="resolve,plugin_common.dist"/>
 
 </project>