Changeset 31714 in osm for applications

Timestamp:

2015-10-27T02:06:15+01:00 (9 years ago)

Author:

donvip

Message:

[apache-commons] remove logging, already included in JOSM core, remove log4j dependency

Location:

applications/editors/josm/plugins/apache-commons

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (2 diffs)
• src/org/apache/commons (modified) (1 prop)

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.7"/>
-        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-log4j"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -14 +14 @@
         <property name="josm" location="../../core/dist/josm-custom.jar"/>
         <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="plugin.requires" value="log4j"/>
+    <!--<property name="plugin.requires" value=""/>-->
     <property name="plugin.stage" value="10"/>
 
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
-
-        <property name="log4j" location="${plugin.dist.dir}/log4j.jar"/>
 
     <!--
@@ -41 +39 @@
         <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/logging/impl/AvalonLogger.java" />
-            <exclude name="**/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" />
-            <exclude name="**/org/apache/commons/logging/impl/LogKitLogger.java" />
-            <exclude name="**/org/apache/commons/logging/impl/ServletContextCleaner.java" />
             <classpath>
                 <pathelement path="${plugin.build.dir}"/>
                 <pathelement location="${josm}"/>
-                <pathelement location="${log4j}"/>
             </classpath>
             <compilerarg value="-Xlint:deprecation"/>

applications/editors/josm/plugins/apache-commons/src/org/apache/commons

@@ -2 +2 @@
 https://github.com/apache/commons-lang/trunk/src/main/java/org/apache/commons/lang3 lang3
 https://github.com/apache/commons-collections/trunk/src/main/java/org/apache/commons/collections4 collections4
-https://github.com/apache/commons-logging/trunk/src/main/java/org/apache/commons/logging logging
+

@@ -2 +2 @@
 https://github.com/apache/commons-lang/trunk/src/main/java/org/apache/commons/lang3 lang3
 https://github.com/apache/commons-collections/trunk/src/main/java/org/apache/commons/collections4 collections4
-https://github.com/apache/commons-logging/trunk/src/main/java/org/apache/commons/logging logging
+

@@ -2 +2 @@
 https://github.com/apache/commons-lang/trunk/src/main/java/org/apache/commons/lang3 lang3
 https://github.com/apache/commons-collections/trunk/src/main/java/org/apache/commons/collections4 collections4
-https://github.com/apache/commons-logging/trunk/src/main/java/org/apache/commons/logging logging
+