Index: /applications/editors/josm/plugins/mapillary/.classpath
===================================================================
--- /applications/editors/josm/plugins/mapillary/.classpath	(revision 31676)
+++ /applications/editors/josm/plugins/mapillary/.classpath	(revision 31677)
@@ -10,5 +10,5 @@
 	<classpathentry kind="lib" path="lib/httpcore-4.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.5.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-commons-imaging"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /applications/editors/josm/plugins/mapillary/build.xml
===================================================================
--- /applications/editors/josm/plugins/mapillary/build.xml	(revision 31676)
+++ /applications/editors/josm/plugins/mapillary/build.xml	(revision 31677)
@@ -12,5 +12,5 @@
     <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Mapillary"/>
     <!--<property name="plugin.early" value="..."/>-->
-    <property name="plugin.requires" value="commons-imaging"/>
+    <property name="plugin.requires" value="apache-commons"/>
     <!--<property name="plugin.stage" value="..."/>-->
     
@@ -23,5 +23,5 @@
     
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
-        <include name="commons-imaging.jar"/>
+        <include name="apache-commons.jar"/>
     </fileset>
 </project>
Index: /applications/editors/josm/plugins/opendata/.classpath
===================================================================
--- /applications/editors/josm/plugins/opendata/.classpath	(revision 31676)
+++ /applications/editors/josm/plugins/opendata/.classpath	(revision 31677)
@@ -16,5 +16,4 @@
 	<classpathentry kind="src" path="util"/>
 	<classpathentry kind="src" path="test/unit"/>
-	<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"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
@@ -22,4 +21,10 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /applications/editors/josm/plugins/opendata/.settings/org.sonar.ide.eclipse.core.prefs
===================================================================
--- /applications/editors/josm/plugins/opendata/.settings/org.sonar.ide.eclipse.core.prefs	(revision 31676)
+++ /applications/editors/josm/plugins/opendata/.settings/org.sonar.ide.eclipse.core.prefs	(revision 31677)
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 extraProperties=sonar.sources\=src,modules/*/src\r\nsonar.tests\=test/functional,test/performance,test/unit\r\nsonar.exclusions\=includes/**/*.java
-lastAnalysisDate=1413638065029
+lastAnalysisDate=1438388786000
 projectKey=josm-plugins
-serverUrl=http\://donvip.fr/sonar
+serverUrl=https\://josm.openstreetmap.de/sonar
 version=2
Index: /applications/editors/josm/plugins/opendata/README
===================================================================
--- /applications/editors/josm/plugins/opendata/README	(revision 31676)
+++ /applications/editors/josm/plugins/opendata/README	(revision 31677)
@@ -20,5 +20,4 @@
     - org/apache: three Apache COTS (Apache License 2.0, see LICENSE-2.0.txt)
         - commons/collections: Apache Commons Collections 3.2.1 (used by jOpenDocument)
-        - commons/lang3: Apache Commons Lang 3.1 (stuff related to WordUtils, used by the plugin itself)
         - poi: Apache POI 3.7 (Excel format support without styles, formulas and writing capabilities, used by the plugin itself)
     - org/j7zip: J7zip 4.43alpha2 (7z archive read support, LGPL v2.1, see LGPL-2.1.txt)
Index: /applications/editors/josm/plugins/opendata/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/build.xml	(revision 31676)
+++ /applications/editors/josm/plugins/opendata/build.xml	(revision 31677)
@@ -8,5 +8,5 @@
     <property name="plugin.canloadatruntime" value="true"/>
     <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
-    <property name="plugin.requires" value="jts;geotools;utilsplugin2"/>
+    <property name="plugin.requires" value="apache-commons;jts;geotools;utilsplugin2"/>
 
     <!-- ** include targets that all plugins have in common ** -->
@@ -14,4 +14,5 @@
     
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+        <include name="apache-commons.jar"/>
         <include name="jts.jar"/>
         <include name="geotools.jar"/>
@@ -19,16 +20,8 @@
     </fileset>
 
+    <property name="apache-commons" location="${plugin.dist.dir}/apache-commons.jar"/>
     <property name="jts" location="${plugin.dist.dir}/jts.jar"/>
     <property name="geotools" location="${plugin.dist.dir}/geotools.jar"/>
     
-    <!--
-    **********************************************************
-    ** compile_lang3 - compiles Apache Commons Lang 3 needed classes
-    **********************************************************
-    -->
-    <target name="compile_lang3" depends="init">
-        <echo message="compiling Apache Commons Lang 3 ... "/>
-        <javac srcdir="includes/org/apache/commons/lang3" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
-    </target>
     <!--
     **********************************************************
@@ -86,5 +79,5 @@
     **********************************************************
     -->
-    <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
+    <target name="compile" depends="init, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
         <echo message="compiling sources for ${plugin.jar} ... "/>
         <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
@@ -92,4 +85,5 @@
                 <pathelement path="${plugin.build.dir}"/>
                 <pathelement location="${josm}"/>
+                <pathelement location="${apache-commons}"/>
                 <pathelement location="${jts}"/>
                 <pathelement location="${geotools}"/>
Index: /applications/editors/josm/plugins/photo_geotagging/.classpath
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/.classpath	(revision 31676)
+++ /applications/editors/josm/plugins/photo_geotagging/.classpath	(revision 31677)
@@ -4,5 +4,5 @@
 	<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"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-commons-imaging"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /applications/editors/josm/plugins/photo_geotagging/build.xml
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 31676)
+++ /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 31677)
@@ -13,5 +13,5 @@
     <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Photo_Geotagging"/>
     <property name="plugin.canloadatruntime" value="true"/>
-    <property name="plugin.requires" value="commons-imaging"/>
+    <property name="plugin.requires" value="apache-commons"/>
 
     <!-- ** include targets that all plugins have in common ** -->
@@ -19,5 +19,5 @@
 
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
-        <include name="commons-imaging.jar"/>
+        <include name="apache-commons.jar"/>
     </fileset>