Index: applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- applications/editors/josm/plugins/alignways/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/alignways/build.xml	(revision 30530)
@@ -33,5 +33,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm};${plugin.lib.dir}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm};${plugin.lib.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- applications/editors/josm/plugins/czechaddress/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/czechaddress/build.xml	(revision 30530)
@@ -16,5 +16,5 @@
     </target>
     <target name="compile" depends="init,revision" description="Compile the plugin and make it ready for running">
-        <javac srcdir="src" classpath="${josm}" debug="true" encoding="utf8" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" encoding="utf8" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/dataimport/build.xml
===================================================================
--- applications/editors/josm/plugins/dataimport/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/dataimport/build.xml	(revision 30530)
@@ -32,5 +32,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/ext_tools/build.xml
===================================================================
--- applications/editors/josm/plugins/ext_tools/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/ext_tools/build.xml	(revision 30530)
@@ -32,5 +32,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- applications/editors/josm/plugins/globalsat/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/globalsat/build.xml	(revision 30530)
@@ -20,5 +20,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- applications/editors/josm/plugins/graphview/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/graphview/build.xml	(revision 30530)
@@ -26,5 +26,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/infomode/build.xml
===================================================================
--- applications/editors/josm/plugins/infomode/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/infomode/build.xml	(revision 30530)
@@ -29,5 +29,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/irsrectify/.classpath
===================================================================
--- applications/editors/josm/plugins/irsrectify/.classpath	(revision 30530)
+++ applications/editors/josm/plugins/irsrectify/.classpath	(revision 30530)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<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 kind="output" path="build"/>
+</classpath>
Index: applications/editors/josm/plugins/irsrectify/.project
===================================================================
--- applications/editors/josm/plugins/irsrectify/.project	(revision 30530)
+++ applications/editors/josm/plugins/irsrectify/.project	(revision 30530)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-irsrectify</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: applications/editors/josm/plugins/irsrectify/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/irsrectify/.settings/org.eclipse.jdt.core.prefs	(revision 30530)
+++ applications/editors/josm/plugins/irsrectify/.settings/org.eclipse.jdt.core.prefs	(revision 30530)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
Index: applications/editors/josm/plugins/irsrectify/build.xml
===================================================================
--- applications/editors/josm/plugins/irsrectify/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/irsrectify/build.xml	(revision 30530)
@@ -32,5 +32,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/native-password-manager/build.xml
===================================================================
--- applications/editors/josm/plugins/native-password-manager/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/native-password-manager/build.xml	(revision 30530)
@@ -27,5 +27,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- applications/editors/josm/plugins/nearclick/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/nearclick/build.xml	(revision 30530)
@@ -15,5 +15,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 30530)
@@ -13,5 +13,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- applications/editors/josm/plugins/openvisible/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/openvisible/build.xml	(revision 30530)
@@ -19,5 +19,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- applications/editors/josm/plugins/plastic_laf/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/plastic_laf/build.xml	(revision 30530)
@@ -16,5 +16,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/routes/build.xml
===================================================================
--- applications/editors/josm/plugins/routes/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/routes/build.xml	(revision 30530)
@@ -13,5 +13,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/routing/build.xml
===================================================================
--- applications/editors/josm/plugins/routing/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/routing/build.xml	(revision 30530)
@@ -30,5 +30,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/surveyor2/.classpath
===================================================================
--- applications/editors/josm/plugins/surveyor2/.classpath	(revision 30530)
+++ applications/editors/josm/plugins/surveyor2/.classpath	(revision 30530)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<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 kind="output" path="build"/>
+</classpath>
Index: applications/editors/josm/plugins/surveyor2/.project
===================================================================
--- applications/editors/josm/plugins/surveyor2/.project	(revision 30530)
+++ applications/editors/josm/plugins/surveyor2/.project	(revision 30530)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-surveyor2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: applications/editors/josm/plugins/surveyor2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/surveyor2/.settings/org.eclipse.jdt.core.prefs	(revision 30530)
+++ applications/editors/josm/plugins/surveyor2/.settings/org.eclipse.jdt.core.prefs	(revision 30530)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
Index: applications/editors/josm/plugins/surveyor2/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor2/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/surveyor2/build.xml	(revision 30530)
@@ -33,5 +33,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 30530)
@@ -13,5 +13,5 @@
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
Index: applications/editors/josm/plugins/videomapping/build.xml
===================================================================
--- applications/editors/josm/plugins/videomapping/build.xml	(revision 30529)
+++ applications/editors/josm/plugins/videomapping/build.xml	(revision 30530)
@@ -36,5 +36,5 @@
     <target name="compile" depends="init">
         <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" encoding="UTF-8">
+        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" encoding="UTF-8" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>