Index: applications/editors/josm/plugins/build.xml
===================================================================
--- applications/editors/josm/plugins/build.xml	(revision 27242)
+++ applications/editors/josm/plugins/build.xml	(revision 27243)
@@ -31,5 +31,4 @@
         <ant antfile="build.xml" target="dist" dir="globalsat"/>
         <ant antfile="build.xml" target="dist" dir="gpxfilter"/>
-        <ant antfile="build.xml" target="dist" dir="gpxpoints"/>
         <ant antfile="build.xml" target="dist" dir="graphview"/>
         <ant antfile="build.xml" target="dist" dir="imageryadjust"/>
@@ -120,5 +119,4 @@
         <ant antfile="build.xml" target="clean" dir="globalsat"/>
         <ant antfile="build.xml" target="clean" dir="gpxfilter"/>
-        <ant antfile="build.xml" target="clean" dir="gpxpoints"/>
         <ant antfile="build.xml" target="clean" dir="graphview"/>
         <ant antfile="build.xml" target="clean" dir="imageryadjust"/>
Index: applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- applications/editors/josm/plugins/osmarender/build.xml	(revision 27242)
+++ applications/editors/josm/plugins/osmarender/build.xml	(revision 27243)
@@ -34,5 +34,5 @@
     <property name="xslt" location="./xslt"/>
     <property name="commit.message" value="Fixed #4360 - osmarender plugin does not load"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4645"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java
===================================================================
--- applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 27242)
+++ applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 27243)
@@ -35,4 +35,5 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.io.OsmWriter;
+import org.openstreetmap.josm.io.OsmWriterFactory;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -63,5 +64,5 @@
             try {
                 // write to plugin dir
-                OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(getPluginDir()+File.separator+"data.osm")), false, "0.6");
+                OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(new FileOutputStream(getPluginDir()+File.separator+"data.osm")), false, "0.6");
                 w.header();
 
Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml	(revision 27242)
+++ applications/editors/josm/plugins/surveyor/build.xml	(revision 27243)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4645"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 27242)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 27243)
@@ -19,4 +19,5 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.OsmWriter;
+import org.openstreetmap.josm.io.OsmWriterFactory;
 
 /**
@@ -52,5 +53,5 @@
             System.out.println("AutoSaving osm data to file " + file.getAbsolutePath());
             synchronized(SurveyorLock.class) {
-                OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.getVersion());
+                OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.getVersion());
                 w.header();
                 w.writeDataSources(dataset);
Index: applications/editors/josm/plugins/undelete/build.xml
===================================================================
--- applications/editors/josm/plugins/undelete/build.xml	(revision 27242)
+++ applications/editors/josm/plugins/undelete/build.xml	(revision 27243)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4602"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java
===================================================================
--- applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java	(revision 27242)
+++ applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java	(revision 27243)
@@ -219,9 +219,9 @@
                       hPrimitive1=h.getLatest();
                       hPrimitive2=h.getByVersion(h.getNumVersions()-1);
-                      
+
                       Relation rel = new Relation(id, (int) hPrimitive1.getVersion());
-                      
+
                       HistoryRelation hRel = (HistoryRelation) hPrimitive2;
-                      
+
                       List<RelationMember> members = new ArrayList<RelationMember>(hRel.getNumMembers());
                       for (org.openstreetmap.josm.data.osm.history.RelationMember m : hRel.getMembers()) {
@@ -237,11 +237,11 @@
                         members.add(new RelationMember(m.getRole(), p));
                       }
-                      
+
                       rel.setMembers(members);
-                      
+
                       primitive=rel;
                   }
 
-                  User user = User.createOsmUser(hPrimitive1.getUid(), hPrimitive1.getUser());
+                  User user = hPrimitive1.getUser();
 
                   primitive.setUser(user);