Ticket #21517: 21517.patch

File 21517.patch, 3.7 KB (added by taylor.smock, 3 years ago)

Move log4j plugin dependencies to ivy

  • plugins/log4j/build.xml 

    diff --git a/plugins/log4j/build.xml b/plugins/log4j/build.xml
index bda07c935..bf997cbdc 100644
    a b  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <project name="log4j" default="dist" basedir=".">
     2<project name="log4j" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
    33    <!-- enter the SVN commit message -->
    44    <property name="commit.message" value="Commit message"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    … …  
    1919
    2020    <!-- ** include targets that all plugins have in common ** -->
    2121    <import file="../build-common.xml"/>
    22 
     22    <target name="pre-compile" depends="fetch_dependencies">
     23        <!-- include fetch_dependencies task -->
     24    </target>
    2325</project>

  • new file plugins/log4j/ivy.xml 

    diff --git a/plugins/log4j/ivy.xml b/plugins/log4j/ivy.xml
new file mode 100644
index 000000000..3bd2b7a03
    - +  
     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.josm.plugins" module="log4j"/>
     5    <dependencies>
     6      <dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.14.1" conf="default->default"/>
     7      <dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="2.14.1" conf="default->default"/>
     8      <dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.14.1" conf="default->default"/>
     9    </dependencies>
     10</ivy-module>
     11