Index: applications/editors/josm/plugins/apache-commons/.classpath
===================================================================
--- applications/editors/josm/plugins/apache-commons/.classpath	(revision 31672)
+++ applications/editors/josm/plugins/apache-commons/.classpath	(revision 31673)
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java" kind="src" path="src"/>
 	<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>
Index: applications/editors/josm/plugins/apache-commons/.settings/org.eclipse.core.resources.prefs
===================================================================
--- applications/editors/josm/plugins/apache-commons/.settings/org.eclipse.core.resources.prefs	(revision 31673)
+++ applications/editors/josm/plugins/apache-commons/.settings/org.eclipse.core.resources.prefs	(revision 31673)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/org/apache/commons/lang3=ISO-8859-1
+encoding/<project>=UTF-8
Index: applications/editors/josm/plugins/apache-commons/.settings/org.eclipse.core.runtime.prefs
===================================================================
--- applications/editors/josm/plugins/apache-commons/.settings/org.eclipse.core.runtime.prefs	(revision 31673)
+++ applications/editors/josm/plugins/apache-commons/.settings/org.eclipse.core.runtime.prefs	(revision 31673)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\r\n
Index: applications/editors/josm/plugins/apache-commons/build.xml
===================================================================
--- applications/editors/josm/plugins/apache-commons/build.xml	(revision 31672)
+++ applications/editors/josm/plugins/apache-commons/build.xml	(revision 31673)
@@ -14,8 +14,44 @@
 	<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.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"/>
+
+    <!--
+    ***************************************************************
+    ** 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>
+
+    <!--
+    **********************************************************
+    ** 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/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"/>
+            <compilerarg value="-Xlint:unchecked"/>
+        </javac>
+    </target>
+
 </project>