Changeset 35852 in osm

Timestamp:

2021-11-05T01:00:03+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #21517 - Move plugin log4j to apache ivy (patch by taylor.smock)

Location:

applications/editors/josm/plugins/log4j

Files:

• .classpath (modified) (1 diff)
• .project (modified) (1 diff)
• .settings/org.apache.ivyde.eclipse.prefs (added)
• build.xml (modified) (2 diffs)
• ivy.xml (added)
• lib (modified) (1 prop)
• lib/log4j-1.2-api-2.11.1-javadoc.jar (deleted)
• lib/log4j-1.2-api-2.11.1-sources.jar (deleted)
• lib/log4j-1.2-api-2.11.1.jar (deleted)
• lib/log4j-api-2.11.1-javadoc.jar (deleted)
• lib/log4j-api-2.11.1-sources.jar (deleted)
• lib/log4j-api-2.11.1.jar (deleted)
• lib/log4j-core-2.11.1-javadoc.jar (deleted)
• lib/log4j-core-2.11.1-sources.jar (deleted)
• lib/log4j-core-2.11.1.jar (deleted)

applications/editors/josm/plugins/log4j/.classpath

@@ -4 +4 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-        <classpathentry exported="true" kind="lib" path="lib/log4j-1.2-api-2.11.1.jar" sourcepath="lib/log4j-1.2-api-2.11.1-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-log4j/lib/log4j-1.2-api-2.11.1-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry exported="true" kind="lib" path="lib/log4j-api-2.11.1.jar" sourcepath="lib/log4j-api-2.11.1-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-log4j/lib/log4j-api-2.11.1-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry exported="true" kind="lib" path="lib/log4j-core-2.11.1.jar" sourcepath="lib/log4j-core-2.11.1-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-log4j/lib/log4j-core-2.11.1-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
+        <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM-log4j&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/log4j/.project

@@ -20 +20 @@
                 <nature>org.sonar.ide.eclipse.core.sonarNature</nature>
                 <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>org.apache.ivyde.eclipse.ivynature</nature>
         </natures>
 </projectDescription>

applications/editors/josm/plugins/log4j/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="log4j" default="dist" basedir=".">
+<project name="log4j" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Commit message"/>
@@ -20 +20 @@
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
-
+    <target name="pre-compile" depends="fetch_dependencies">
+        <!-- include fetch_dependencies task -->
+    </target>
 </project>