More version updates, fix compile failures in webapp

geoserver/webapp/api-composer/src/main/java/com/boundlessgeo/geoserver/api/controllers/FormatController.java

@@ -12,8 +12,8 @@
 import org.geotools.data.DataAccessFactory;
 import org.geotools.data.DataAccessFactory.Param;
 import org.geotools.data.DataAccessFinder;
-import org.geotools.data.wms.WebMapServer;
 import org.geotools.jdbc.JDBCJNDIDataStoreFactory;
+import org.geotools.ows.wms.WebMapServer;
 import org.geotools.util.logging.Logging;
 import org.opengis.coverage.grid.Format;
 import org.springframework.beans.factory.annotation.Autowired;

geoserver/webapp/api-composer/src/main/java/com/boundlessgeo/geoserver/api/controllers/IO.java

@@ -54,13 +54,14 @@
 import org.geoserver.platform.resource.Paths;
 import org.geotools.coverage.grid.io.AbstractGridFormat;
 import org.geotools.coverage.grid.io.GridCoverage2DReader;
+import org.geotools.coverage.util.FeatureUtilities;
 import org.geotools.data.DataAccess;
 import org.geotools.data.DataAccessFactory;
 import org.geotools.data.DataStore;
 import org.geotools.data.FileDataStoreFactorySpi;
 import org.geotools.data.DataAccessFactory.Param;
-import org.geotools.data.ows.Layer;
 import org.geotools.data.Parameter;
+import org.geotools.data.util.NullProgressListener;
 import org.geotools.feature.FeatureCollection;
 import org.geotools.feature.FeatureIterator;
 import org.geotools.feature.FeatureTypes;
@@ -70,11 +71,10 @@
 import org.geotools.geometry.jts.Geometries;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.jdbc.JDBCDataStoreFactory;
+import org.geotools.ows.wms.Layer;
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.geotools.resources.coverage.FeatureUtilities;
 import org.geotools.util.Converters;
-import org.geotools.util.NullProgressListener;
 import org.geotools.util.logging.Logging;
 import org.ocpsoft.pretty.time.PrettyTime;
 import org.opengis.coverage.grid.Format;
@@ -106,8 +106,8 @@
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterables;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * Helper for encoding/decoding objects to/from JSON.

geoserver/webapp/api-composer/src/main/java/com/boundlessgeo/geoserver/api/controllers/MapController.java

@@ -67,7 +67,7 @@
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 
 @Controller("apiMapController")
 @RequestMapping(API_PATH+"/maps")

geoserver/webapp/api-composer/src/main/java/com/boundlessgeo/geoserver/api/controllers/ServerInfoController.java

@@ -96,7 +96,7 @@ JSONObj get() {
                 Class<?> returnType = resultInfo.get("result").getType();
 
                 //Only include processes that return a geometry or a raster
-                if (com.vividsolutions.jts.geom.Geometry.class.isAssignableFrom(returnType) || 
+                if (org.locationtech.jts.geom.Geometry.class.isAssignableFrom(returnType) ||
                         org.geotools.data.simple.SimpleFeatureCollection.class.isAssignableFrom(returnType) ||
                         org.geotools.coverage.grid.GridCoverage2D.class.isAssignableFrom(returnType)) {
                     JSONObj process = arr.addObject();

geoserver/webapp/api-composer/src/main/java/com/boundlessgeo/geoserver/api/controllers/StoreController.java

@@ -31,23 +31,18 @@
 import org.geoserver.catalog.WorkspaceInfo;
 import org.geoserver.catalog.util.CloseableIterator;
 import org.geoserver.config.GeoServer;
-import org.geoserver.platform.resource.Files;
 import org.geotools.data.DataAccess;
 import org.geotools.data.DataAccessFinder;
 import org.geotools.data.DataStore;
 import org.geotools.data.FeatureSource;
 import org.geotools.data.Query;
-import org.geotools.data.simple.SimpleFeatureSource;
-import org.geotools.data.wms.WebMapServer;
+import org.geotools.data.util.NullProgressListener;
 import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureIterator;
 import org.geotools.feature.NameImpl;
-import org.geotools.util.NullProgressListener;
+import org.geotools.ows.wms.WebMapServer;
 import org.geotools.util.logging.Logging;
 import org.opengis.coverage.grid.Format;
 import org.opengis.coverage.grid.GridCoverageReader;
-import org.opengis.feature.Feature;
-import org.opengis.feature.type.FeatureType;
 import org.opengis.filter.Filter;
 import org.opengis.filter.sort.SortBy;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -259,7 +254,6 @@ public void delete(@PathVariable String wsName,
     /**
      * API endpoint to create a new store
      * @param wsName The workspace to create the store in
-     * @param name The name of the new store
      * @param obj The connection parameters for the store
      * @param req The HTTP request
      * @return The description of the newly created store

geoserver/webapp/api-composer/src/main/java/com/boundlessgeo/geoserver/bundle/BundleExporter.java

@@ -443,7 +443,7 @@ void ingestInto(GeoPackage gpkg, DataStoreInfo store) throws IOException {
                 if (geom != null) {
                     fe.setGeometryColumn(geom.getLocalName());
                     fe.setGeometryType(Geometries.getForBinding(
-                        (Class<? extends com.vividsolutions.jts.geom.Geometry>) geom.getType().getBinding()));
+                        (Class<? extends org.locationtech.jts.geom.Geometry>) geom.getType().getBinding()));
                 }
 
                 gpkg.add(fe, (SimpleFeatureSource) ft.getFeatureSource(null, null), Filter.INCLUDE);

geoserver/webapp/api-composer/src/test/java/com/boundlessgeo/geoserver/api/controllers/IOTest.java

@@ -9,7 +9,7 @@
 import org.opengis.feature.simple.SimpleFeatureType;
 import com.boundlessgeo.geoserver.Proj;
 import com.boundlessgeo.geoserver.json.JSONObj;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Point;
 
 public class IOTest {
 

geoserver/webapp/api-composer/src/test/java/com/boundlessgeo/geoserver/api/controllers/MockGeoServer.java

@@ -59,10 +59,10 @@
 import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.styling.FeatureTypeStyle;
 import org.geotools.styling.Rule;
-import org.geotools.styling.SLDTransformer;
 import org.geotools.styling.Style;
 import org.geotools.styling.StyleFactory;
 import org.geotools.util.KVP;
+import org.geotools.xml.styling.SLDTransformer;
 import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;

geoserver/webapp/api-composer/src/test/java/com/boundlessgeo/geoserver/bundle/BundleTestSupport.java

@@ -1,13 +1,13 @@
 package com.boundlessgeo.geoserver.bundle;
 
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
+import org.geoserver.config.GeoServerConfigPersister;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 import org.apache.commons.io.FileUtils;
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.impl.CatalogImpl;
-import org.geoserver.config.GeoServerPersister;
 import org.geoserver.config.util.XStreamPersisterFactory;
 import org.geoserver.platform.GeoServerResourceLoader;
 import org.geotools.util.logging.Logging;
@@ -61,7 +61,7 @@ protected Catalog createCatalog() throws IOException {
 
         Catalog cat = new CatalogImpl();
         cat.setResourceLoader(resourceLoader);
-        cat.addListener(new GeoServerPersister(resourceLoader, new XStreamPersisterFactory().createXMLPersister()));
+        cat.addListener(new GeoServerConfigPersister(resourceLoader, new XStreamPersisterFactory().createXMLPersister()));
         return cat;
     }
 

geoserver/webapp/pom.xml

@@ -58,15 +58,15 @@
 
   <properties>
     <project.version>1.0-SNAPSHOT</project.version>
-    <gs.version>2.13-SNAPSHOT</gs.version>
-    <gwc.version>1.13-SNAPSHOT</gwc.version>
-    <gt.version>19-SNAPSHOT</gt.version>
-    <imageio.ext.version>1.1.24</imageio.ext.version>
-    <jetty.version>9.2.13.v20150730</jetty.version>
-    <spring.version>4.3.18.RELEASE</spring.version>
-    <spring.security.version>4.2.7.RELEASE</spring.security.version>
+    <gs.version>2.15-SNAPSHOT</gs.version>
+    <gwc.version>1.15-SNAPSHOT</gwc.version>
+    <gt.version>21-SNAPSHOT</gt.version>
+    <imageio.ext.version>1.2.0</imageio.ext.version>
+    <jetty.version>9.4.12.v20180830</jetty.version>
+    <spring.version>5.1.1.RELEASE</spring.version>
+    <spring.security.version>5.1.1.RELEASE</spring.security.version>
     <servlet-api.version>3.1.0</servlet-api.version>
-    <jackson.version>2.8.7</jackson.version>
+    <jackson.version>2.9.7</jackson.version>
   </properties>
 
   <dependencyManagement>

geoserver/webapp/web-app/src/test/java/com/boundlessgeo/geoserver/AppIntegrationTest.java

@@ -27,10 +27,10 @@
 import org.geotools.data.DataAccess;
 import org.geotools.data.FeatureSource;
 import org.geotools.data.Query;
+import org.geotools.data.util.NullProgressListener;
 import org.geotools.feature.FeatureIterator;
 import org.geotools.feature.NameImpl;
 import org.geotools.referencing.CRS;
-import org.geotools.util.NullProgressListener;
 import org.junit.Before;
 import org.junit.Test;
 import org.opengis.feature.Feature;

geoserver/webapp/web-app/src/test/java/com/boundlessgeo/geoserver/H2TestData.java

@@ -24,7 +24,7 @@
 import org.opengis.feature.simple.SimpleFeatureType;
 
 import com.boundlessgeo.geoserver.json.JSONObj;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTReader;
 
 public class H2TestData implements AutoCloseable {
 

geoserver/webapp/web-app/src/test/java/com/boundlessgeo/geoserver/Start.java

@@ -48,7 +48,6 @@ public static void main(String[] args) {
             conn.setPort(port);
             conn.setAcceptQueueSize(100);
             conn.setIdleTimeout(1000 * 60 * 60);
-            conn.setSoLingerTime(-1);
             jettyServer.setConnectors(new Connector[] { conn });
 
             WebAppContext wah = new WebAppContext();

geowebcache/pom.xml

@@ -4,12 +4,12 @@
   <groupId>com.boundlessgeo.suite</groupId>
   <artifactId>geowebcache</artifactId>
   <packaging>war</packaging>
-  <version>1.13-SNAPSHOT</version>
+  <version>1.15-SNAPSHOT</version>
   <name>Boundless Suite GeoWebCache</name>
   <description>Boundless GeoExplorer WAR Distrobution</description>
 
   <properties>
-    <gwc.version>1.13-SNAPSHOT</gwc.version>
+    <gwc.version>1.15-SNAPSHOT</gwc.version>
   </properties>
 
   <dependencies>