Ticket #18916: 18916.4.patch

File 18916.4.patch, 13.7 KB (added by taylor.smock, 3 months ago)

All the Ivy (hey, no warnings now, except for CheckstyleNature)

  • .classpath

     
    33        <classpathentry excluding="org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/apache/commons/collections4/bloomfilter/hasher/function/Murmur128x86Cyclic.java|org/apache/commons/collections4/bloomfilter/hasher/function/Murmur32x86Iterative.java" kind="src" path="src"/>
    44        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
    6         <classpathentry exported="true" kind="lib" path="lib/xz-1.6.jar" sourcepath="lib/xz-1.6-sources.jar">
    7                 <attributes>
    8                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/xz-1.6-javadoc.jar!/"/>
    9                 </attributes>
    10         </classpathentry>
    11         <classpathentry exported="true" kind="lib" path="lib/dec-0.1.2.jar" sourcepath="lib/dec-0.1.2-sources.jar">
    12                 <attributes>
    13                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/dec-0.1.2-javadoc.jar!/"/>
    14                 </attributes>
    15         </classpathentry>
    16         <classpathentry kind="lib" path="lib/zstd-jni-1.3.2-2.jar" sourcepath="lib/zstd-jni-1.3.2-2-sources.jar">
    17                 <attributes>
    18                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/zstd-jni-1.3.2-2-javadoc.jar!/"/>
    19                 </attributes>
    20         </classpathentry>
     6        <classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM-apache-commons&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
    217        <classpathentry kind="output" path="bin"/>
    228</classpath>
  • .project

     
    33        <name>JOSM-apache-commons</name>
    44        <comment></comment>
    55        <projects>
     6                <project>JOSM</project>
    67        </projects>
    78        <buildSpec>
    89                <buildCommand>
     
    2425        <natures>
    2526                <nature>org.eclipse.jdt.core.javanature</nature>
    2627                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
     28                <nature>org.apache.ivyde.eclipse.ivynature</nature>
    2729        </natures>
    2830</projectDescription>
  • .settings/org.eclipse.core.resources.prefs

     
    11eclipse.preferences.version=1
    2 encoding//src/org/apache/commons/lang3=ISO-8859-1
    32encoding/<project>=UTF-8
  • build.xml

     
    1 <?xml version="1.0" encoding="utf-8"?>
    2 <project name="apache-commons" default="dist" basedir=".">
    3 
    4     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    5     <property name="plugin.main.version" value="10580"/>
    6 
    7     <!-- Configure these properties (replace "..." accordingly).
    8          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    9     -->
    10     <property name="plugin.author" value="nokutu; Don-vip"/>
    11     <property name="plugin.class" value="org.openstreetmap.josm.plugins.commons.CommonsPlugin"/>
    12     <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."/>
    13    
    14         <property name="josm" location="../../core/dist/josm-custom.jar"/>
    15         <property name="plugin.dist.dir" value="../../dist"/>
    16     <!--<property name="plugin.requires" value=""/>-->
    17     <property name="plugin.stage" value="10"/>
    18 
    19     <property name="plugin.canloadatruntime" value="true"/>
    20 
    21     <!-- ** include targets that all plugins have in common ** -->
    22     <import file="../build-common.xml"/>
    23 
    24     <!--
    25     ***************************************************************
    26     ** compile_lang3 - compiles Apache Commons Lang 3 (not UTF-8 !)
    27     ***************************************************************
    28     -->
    29     <target name="compile_lang3" depends="init">
    30         <echo message="compiling Apache Commons Lang 3 ... "/>
    31         <javac srcdir="src" includes="org/apache/commons/lang3/**" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
    32     </target>
    33 
    34     <!--
    35     **********************************************************
    36     ** compile - compiles the source tree
    37     **********************************************************
    38     -->
    39     <target name="compile" depends="compile_lang3">
    40         <echo message="compiling sources for ${plugin.jar} ... "/>
    41         <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
    42             <exclude name="**/org/apache/commons/lang3/**" />
    43             <exclude name="**/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur*.java" />
    44             <classpath>
    45                 <pathelement path="${plugin.build.dir}"/>
    46                 <path refid="plugin.classpath"/>
    47             </classpath>
    48         </javac>
    49     </target>
    50 
    51         <target name="pre-javadoc">
    52         <delete><fileset dir="src" includes="**/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur*.java"/></delete>
    53     </target>
    54 
    55 </project>
     1<?xml version="1.0" encoding="utf-8"?>
     2<project name="apache-commons" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     3
     4    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     5    <property name="plugin.main.version" value="10580"/>
     6
     7    <!-- Configure these properties (replace "..." accordingly).
     8         See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
     9    -->
     10    <property name="plugin.author" value="nokutu; Don-vip"/>
     11    <property name="plugin.class" value="org.openstreetmap.josm.plugins.commons.CommonsPlugin"/>
     12    <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."/>
     13
     14    <!--<property name="plugin.requires" value=""/>-->
     15    <property name="plugin.stage" value="10"/>
     16
     17    <property name="plugin.canloadatruntime" value="true"/>
     18
     19    <!-- ** include targets that all plugins have in common ** -->
     20    <import file="../build-common.xml"/>
     21
     22    <target name="resolve" description="--> retrieve dependencies with Ivy">
     23        <ivy:retrieve/>
     24    </target>
     25
     26    <target name="dist" depends="resolve,plugin_common.dist"/>
     27
     28</project>
  • ivy.xml

     
     1<?xml version="1.0" encoding="utf-8"?>
     2<!-- License: GPL. For details, see LICENSE file. -->
     3<ivy-module version="2.0">
     4    <info organisation="org.openstreetmap" module="josm"/>
     5    <configurations>
     6        <conf name="ivy" description="Apache Ivy configuration for self-update"/>
     7        <!--  configuration that should be used when specifying dependencies -->
     8        <conf name="implementation" description="All libs JOSM uses that plugins should not use"/>
     9        <conf name="api" description="All libs that JOSM uses and are available for plugins"/>
     10        <conf name="runtimeOnly" description="The libs shipped with JOSM that we do not need during compilation"/>
     11        <conf name="provided" description="The libs we need during compilation but not on application start"/>
     12        <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
     13        <!--  Meta configuration used in build scripts -->
     14        <conf name="runtime" description="Libraries only needed at runtime" extends="implementation,api,runtimeOnly"/>
     15        <conf name="compile" description="Libraries needed only for compilation" extends="implementation,api,provided"/>
     16        <conf name="test" description="Libraries only needed for testing" extends="compile,runtime"/>
     17    </configurations>
     18    <dependencies>
     19        <dependency org="com.github.luben" name="zstd-jni" rev="1.4.4-7" conf="api->default"/>
     20        <dependency org="org.apache.commons" name="commons-collections4" rev="4.4" conf="api->default"/>
     21        <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="api->default"/>
     22        <dependency org="org.apache.commons" name="commons-imaging" rev="1.0-alpha1" conf="api->default"/>
     23        <!-- Apache Commons IO does not use the standard org name -->
     24        <dependency org="commons-io" name="commons-io" rev="2.6" conf="api->default"/>
     25        <dependency org="org.apache.commons" name="commons-lang3" rev="3.9" conf="api->default"/>
     26        <dependency org="org.apache.commons" name="commons-math3" rev="3.6.1" conf="api->default"/>
     27        <dependency org="org.apache.commons" name="commons-text" rev="1.8" conf="api->default"/>
     28        <dependency org="org.brotli" name="dec" rev="0.1.2" conf="api->default"/>
     29        <dependency org="org.tukaani" name="xz" rev="1.8" conf="api->default"/>
     30    </dependencies>
     31</ivy-module>
  • src/org/apache/commons

    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/dec-0.1.2-javadoc.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/dec-0.1.2-sources.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/dec-0.1.2.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/xz-1.6-javadoc.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/xz-1.6-sources.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/xz-1.6.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/zstd-jni-1.3.2-2-javadoc.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/zstd-jni-1.3.2-2-sources.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: lib/zstd-jni-1.3.2-2.jar
    ___________________________________________________________________
    Deleted: svn:mime-type
    ## -1 +0,0 ##
    -application/octet-stream
    \ No newline at end of property