Index: /applications/editors/josm/plugins/geotools/.classpath
===================================================================
--- /applications/editors/josm/plugins/geotools/.classpath	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/.classpath	(revision 32813)
@@ -6,55 +6,55 @@
 	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gt-api-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-api-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-data-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-data-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-main-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-main-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-14.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-15.1.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
@@ -62,8 +62,8 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.1.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.1.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.1.15.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.1.15.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.15.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.15.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_codec-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_core-1.1.3.jar"/>
@@ -71,14 +71,14 @@
 	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-contour-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-utils-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.4.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
Index: /applications/editors/josm/plugins/geotools/README
===================================================================
--- /applications/editors/josm/plugins/geotools/README	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/README	(revision 32813)
@@ -4,3 +4,3 @@
     * Licensed under GPL v3 (see LICENSE)
 
-The current embedded version of GeoTools is 14.1.
+The current embedded version of GeoTools is 15.1.
Index: /applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- /applications/editors/josm/plugins/geotools/build.xml	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/build.xml	(revision 32813)
@@ -21,4 +21,16 @@
         <include name="ejml.jar"/>
     </fileset>
+
+    <target name="merge-geotools-services">
+        <taskdef resource="org/pescuma/mergeservices/antlib.xml" classpath="tools/merge-services.jar" />
+    	<delete dir="jar/META-INF/services"/>
+    	<merge-services dest="jar">
+    	    <fileset dir="lib">
+    	        <include name="**/*.jar" />
+    	        <exclude name="**/*-javadoc.jar" />
+    	        <exclude name="**/*-source.jar" />
+    	    </fileset>
+    	</merge-services>
+    </target>
 
     <!--
@@ -55,8 +67,8 @@
         	     see http://stackoverflow.com/a/18495658/2257172 -->
             <attribute name="Specification-Title" value="JOSM GeoTools plugin"/>
-            <attribute name="Specification-Version" value="14.1"/>
+            <attribute name="Specification-Version" value="15.1"/>
             <attribute name="Specification-Vendor" value="JOSM developers" />
             <attribute name="Implementation-Title" value="org.openstreetmap.josm.plugins.geotools" />
-            <attribute name="Implementation-Version" value="14.1" />
+            <attribute name="Implementation-Version" value="15.1" />
             <attribute name="Implementation-Vendor" value="JOSM developers"/>
         </manifest>
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.footprint.FootprintLoaderSpi
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.footprint.FootprintLoaderSpi	(revision 32813)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.footprint.FootprintLoaderSpi	(revision 32813)
@@ -0,0 +1,2 @@
+org.geotools.coverage.grid.io.footprint.WKBLoaderSPI
+org.geotools.coverage.grid.io.footprint.WKTLoaderSPI
Index: plications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.feature.FeatureTypeFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.feature.FeatureTypeFactory	(revision 32812)
+++ 	(revision )
@@ -1,1 +1,0 @@
-org.geotools.feature.DefaultFeatureTypeFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 32813)
@@ -13,5 +13,5 @@
 org.geotools.referencing.operation.transform.NTv2Transform$Provider
 org.geotools.referencing.operation.transform.SimilarityTransformProvider
-org.geotools.referencing.operation.transform.WarpTransform2D$Provider
+org.geotools.referencing.operation.transform.WarpTransform2DProvider
 org.geotools.referencing.operation.projection.EquidistantCylindrical$Provider
 org.geotools.referencing.operation.projection.EquidistantCylindrical$SphericalProvider
@@ -54,2 +54,4 @@
 org.geotools.referencing.operation.projection.GeneralOblique$Provider
 org.geotools.referencing.operation.projection.MeteosatSG$Provider
+org.geotools.referencing.operation.projection.GeostationarySatellite$Provider
+org.geotools.referencing.operation.projection.RotatedPole$Provider
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.feature.type.FeatureTypeFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.feature.type.FeatureTypeFactory	(revision 32813)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.feature.type.FeatureTypeFactory	(revision 32813)
@@ -0,0 +1,1 @@
+org.geotools.feature.type.FeatureTypeFactoryImpl
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 32813)
@@ -1,3 +1,3 @@
-org.geotools.filter.AreaFunction
+org.geotools.resources.coverage.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
 org.geotools.filter.LengthFunction
 org.geotools.filter.function.CategorizeFunction
@@ -174,3 +174,2 @@
 org.geotools.filter.function.FilterFunction_list
 org.geotools.styling.visitor.RescaleToPixelsFunction
-org.geotools.resources.coverage.FilterFunction_isCoverage
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 32813)
@@ -1,5 +1,7 @@
-#############################
-# FROM gt-referencing-14.0.jar
-#############################
+org.geotools.referencing.factory.epsg.UnnamedExtension
+org.geotools.referencing.factory.epsg.EsriExtension
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
 org.geotools.referencing.factory.epsg.DefaultFactory
 org.geotools.referencing.factory.epsg.FactoryUsingWKT
@@ -13,15 +15,2 @@
 # pending review
 org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
-
-###########################
-# FROM gt-epsg-hsql-14.0.jar
-###########################
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
-# pending review
-# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
-
-################################
-# FROM gt-epsg-extension-14.0.jar
-################################
-org.geotools.referencing.factory.epsg.UnnamedExtension
-org.geotools.referencing.factory.epsg.EsriExtension
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 32813)
@@ -1,5 +1,5 @@
-#############################
-# FROM gt-referencing-14.0.jar
-#############################
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
 org.geotools.referencing.factory.epsg.DefaultFactory
 org.geotools.referencing.factory.epsg.LongitudeFirstFactory
@@ -9,9 +9,2 @@
 # pending review
 org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
-
-###########################
-# FROM gt-epsg-hsql-14.0.jar
-###########################
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
-# pending review
-# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 32813)
@@ -1,5 +1,5 @@
-#############################
-# FROM gt-referencing-14.0.jar
-#############################
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
 org.geotools.referencing.factory.epsg.DefaultFactory
 org.geotools.referencing.factory.epsg.LongitudeFirstFactory
@@ -9,9 +9,2 @@
 # pending review
 org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
-
-###########################
-# FROM gt-epsg-hsql-14.0.jar
-###########################
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
-# pending review
-# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 32812)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 32813)
@@ -1,5 +1,5 @@
-#############################
-# FROM gt-referencing-14.0.jar
-#############################
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
 org.geotools.referencing.factory.epsg.CoordinateOperationFactoryUsingWKT
 org.geotools.referencing.factory.epsg.DefaultFactory
@@ -10,9 +10,2 @@
 # pending review
 org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
-
-###########################
-# FROM gt-epsg-hsql-14.0.jar
-###########################
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
-# pending review
-# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator