Index: /applications/editors/josm/plugins/ejml/.classpath
===================================================================
--- /applications/editors/josm/plugins/ejml/.classpath	(revision 35121)
+++ /applications/editors/josm/plugins/ejml/.classpath	(revision 35122)
@@ -4,42 +4,42 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<classpathentry kind="lib" path="lib/ejml-cdense-0.32.jar" sourcepath="lib/ejml-cdense-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-cdense-0.34.jar" sourcepath="lib/ejml-cdense-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-cdense-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-cdense-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/ejml-core-0.32.jar" sourcepath="lib/ejml-core-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-core-0.34.jar" sourcepath="lib/ejml-core-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-core-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-core-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/ejml-ddense-0.32.jar" sourcepath="lib/ejml-ddense-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-ddense-0.34.jar" sourcepath="lib/ejml-ddense-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-ddense-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-ddense-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/ejml-dsparse-0.32.jar" sourcepath="lib/ejml-dsparse-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-dsparse-0.34.jar" sourcepath="lib/ejml-dsparse-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-dsparse-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-dsparse-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/ejml-experimental-0.32.jar" sourcepath="lib/ejml-experimental-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-experimental-0.34.jar" sourcepath="lib/ejml-experimental-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-experimental-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-experimental-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/ejml-fdense-0.32.jar" sourcepath="lib/ejml-fdense-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-fdense-0.34.jar" sourcepath="lib/ejml-fdense-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-fdense-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-fdense-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/ejml-simple-0.32.jar" sourcepath="lib/ejml-simple-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-simple-0.34.jar" sourcepath="lib/ejml-simple-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-simple-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-simple-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/ejml-zdense-0.32.jar" sourcepath="lib/ejml-zdense-0.32-sources.jar">
+	<classpathentry kind="lib" path="lib/ejml-zdense-0.34.jar" sourcepath="lib/ejml-zdense-0.34-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-zdense-0.32-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-zdense-0.34-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
Index: /applications/editors/josm/plugins/ejml/README
===================================================================
--- /applications/editors/josm/plugins/ejml/README	(revision 35121)
+++ /applications/editors/josm/plugins/ejml/README	(revision 35122)
@@ -4,3 +4,3 @@
     * Licensed under GPL v3 (see LICENSE)
 
-The current embedded version of EJML is 0.32 (version needed by GeoTools, see https://osgeo-org.atlassian.net/browse/GEOT-5300).
+The current embedded version of EJML is 0.34 (version needed by GeoTools, see https://osgeo-org.atlassian.net/browse/GEOT-6384).
Index: /applications/editors/josm/plugins/jts/.classpath
===================================================================
--- /applications/editors/josm/plugins/jts/.classpath	(revision 35121)
+++ /applications/editors/josm/plugins/jts/.classpath	(revision 35122)
@@ -4,17 +4,12 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<classpathentry exported="true" kind="lib" path="lib/jts-core-1.14.0.jar" sourcepath="lib/jts-core-1.14.0-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/jts-core-1.16.1.jar" sourcepath="lib/jts-core-1.16.1-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-core-1.14.0-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-core-1.16.1-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jts-io-1.14.0.jar" sourcepath="lib/jts-io-1.14.0-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/jts-io-common-1.16.1.jar" sourcepath="lib/jts-io-common-1.16.1-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-io-1.14.0-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jts-example-1.14.0.jar" sourcepath="lib/jts-example-1.14.0-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-example-1.14.0-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-io-common-1.16.1-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
Index: /applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java
===================================================================
--- /applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java	(revision 35121)
+++ /applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java	(revision 35122)
@@ -9,14 +9,14 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.PrecisionModel;
-import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
 
 /**
@@ -84,5 +84,5 @@
     public Point convertNode(Node node) {
         Coordinate[] coords = {convertNodeToCoordinate(node)};
-        return new com.vividsolutions.jts.geom.Point(new CoordinateArraySequence(coords), getGeometryFactory());
+        return new org.locationtech.jts.geom.Point(new CoordinateArraySequence(coords), getGeometryFactory());
     }