graphics/geoserver: Update version 2.8.3=>2.9.0

5 files changed, 136 insertions, 168 deletions

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 61569b74c1db..38cd5c38a80b 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.8.3
+PORTVERSION=	2.9.0
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 1e4a80b8a10e..7e15d62bbd61 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,2 +1,3 @@
-SHA256 (geoserver-2.8.3-bin.zip) = 1f5c970d665864c9e25a40d10a9fc22e1a0970cd669f970b0dde48b680a09b96
-SIZE (geoserver-2.8.3-bin.zip) = 64800398
+TIMESTAMP = 1465646549
+SHA256 (geoserver-2.9.0-bin.zip) = 169c3f801ee338d1f05573123c0f918aeb7b808e1836fd1b43aeaad46630a9a8
+SIZE (geoserver-2.9.0-bin.zip) = 68541868
diff --git a/graphics/geoserver/files/patch-bin_shutdown.sh b/graphics/geoserver/files/patch-bin_shutdown.sh
index 5e657377dc2d..41164a9859cf 100644
--- a/graphics/geoserver/files/patch-bin_shutdown.sh
+++ b/graphics/geoserver/files/patch-bin_shutdown.sh
@@ -1,27 +1,6 @@
---- bin/shutdown.sh.orig	2015-09-30 16:13:46 UTC
+--- bin/shutdown.sh.orig	2016-05-28 00:30:28 UTC
 +++ bin/shutdown.sh
-@@ -5,20 +5,6 @@
- # $Id$
- # -----------------------------------------------------------------------------
- 
--# Make sure prerequisite environment variables are set
--if [ -z "$JAVA_HOME" ]; then
--  echo "The JAVA_HOME environment variable is not defined"
--  echo "This environment variable is needed to run this program"
--  exit 1
--fi
--if [ ! -r "$JAVA_HOME"/bin/java ]; then
--  echo "The JAVA_HOME environment variable is not defined correctly"
--  echo "This environment variable is needed to run this program"
--  exit 1
--fi
--# Set standard commands for invoking Java.
--_RUNJAVA="$JAVA_HOME"/bin/java
--
- if [ -z $GEOSERVER_HOME ]; then
-   #If GEOSERVER_HOME not set then guess a few locations before giving
-   # up and demanding user set it.
-@@ -52,4 +38,4 @@ if [ ! -r "$GEOSERVER_HOME"/start.jar ];
+@@ -60,4 +60,4 @@ if [ ! -r "$GEOSERVER_HOME"/start.jar ];
  fi
  
  cd "$GEOSERVER_HOME"
diff --git a/graphics/geoserver/files/patch-bin_startup.sh b/graphics/geoserver/files/patch-bin_startup.sh
index b4ddbf17e417..8d0d01f72b86 100644
--- a/graphics/geoserver/files/patch-bin_startup.sh
+++ b/graphics/geoserver/files/patch-bin_startup.sh
@@ -1,27 +1,6 @@
---- bin/startup.sh.orig	2015-09-30 16:13:46 UTC
+--- bin/startup.sh.orig	2016-06-11 18:51:47 UTC
 +++ bin/startup.sh
-@@ -5,20 +5,6 @@
- # $Id$
- # -----------------------------------------------------------------------------
- 
--# Make sure prerequisite environment variables are set
--if [ -z "$JAVA_HOME" ]; then
--  echo "The JAVA_HOME environment variable is not defined"
--  echo "This environment variable is needed to run this program"
--  exit 1
--fi
--if [ ! -r "$JAVA_HOME"/bin/java ]; then
--  echo "The JAVA_HOME environment variable is not defined correctly"
--  echo "This environment variable is needed to run this program"
--  exit 1
--fi
--# Set standard commands for invoking Java.
--_RUNJAVA="$JAVA_HOME"/bin/java
--
- if [ -z $GEOSERVER_HOME ]; then
-   #If GEOSERVER_HOME not set then guess a few locations before giving
-   # up and demanding user set it.
-@@ -71,4 +57,4 @@ cd "$GEOSERVER_HOME"
+@@ -74,4 +74,4 @@ cd "$GEOSERVER_HOME"
  echo "GEOSERVER DATA DIR is $GEOSERVER_DATA_DIR"
  #added headless to true by default, if this messes anyone up let the list
  #know and we can change it back, but it seems like it won't hurt -ch
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 6b5c0efa14b3..169fcd783c8d 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -213,6 +213,8 @@
 %%G%%/data_dir/demo/WMS_getMap_multilayer.url
 %%G%%/data_dir/demo/WMS_getMap_multilayer_cql.url
 %%G%%/data_dir/demo/WMS_getMap_multilayer_filter.url
+@sample %%G%%/data_dir/demo/WPS_aggregate_1.0.xml.sample
+@sample %%G%%/data_dir/demo/WPS_aggregate_groupby_1.0.xml.sample
 @sample %%G%%/data_dir/global.xml.sample
 @sample %%G%%/data_dir/layergroups/spearfish.xml.sample
 @sample %%G%%/data_dir/layergroups/tasmania.xml.sample
@@ -355,6 +357,7 @@
 @sample %%G%%/data_dir/wms.xml.sample
 @sample %%G%%/data_dir/workspaces/cite/namespace.xml.sample
 @sample %%G%%/data_dir/workspaces/cite/workspace.xml.sample
+@sample %%G%%/data_dir/workspaces/default.xml.sample
 @sample %%G%%/data_dir/workspaces/it.geosolutions/namespace.xml.sample
 @sample %%G%%/data_dir/workspaces/it.geosolutions/workspace.xml.sample
 @sample %%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/coverage.xml.sample
@@ -477,6 +480,9 @@
 %%G%%/data_dir/www/styles/remoteTasmania.sld
 %%G%%/data_dir/www/wfs-t.html
 @sample %%G%%/etc/jdbcRealm.properties.sample
+@sample %%G%%/etc/jetty-deploy.xml.sample
+@sample %%G%%/etc/jetty-http.xml.sample
+@sample %%G%%/etc/jetty-https.xml.sample
 @sample %%G%%/etc/jetty-jmx-platform.xml.sample
 @sample %%G%%/etc/jetty-jmx.xml.sample
 @sample %%G%%/etc/jetty-plus.xml.sample
@@ -484,7 +490,6 @@
 @sample %%G%%/etc/jetty.xml.sample
 @sample %%G%%/etc/keystore.sample
 @sample %%G%%/etc/realm.properties.sample
-@sample %%G%%/etc/stresstest.xml.sample
 @sample %%G%%/etc/webdefault.xml.sample
 %%G%%/lib/ant-1.6.5.jar
 %%G%%/lib/ant-1.8.4.jar
@@ -494,12 +499,19 @@
 %%G%%/lib/jasper-compiler-5.5.15.jar
 %%G%%/lib/jasper-compiler-jdt-5.5.15.jar
 %%G%%/lib/jasper-runtime-5.5.15.jar
-%%G%%/lib/jetty-6.1.8.jar
-%%G%%/lib/jetty-util-6.1.8.jar
+%%G%%/lib/javax.servlet-api-3.1.0.jar
+%%G%%/lib/jetty-deploy-9.2.13.v20150730.jar
+%%G%%/lib/jetty-http-9.2.13.v20150730.jar
+%%G%%/lib/jetty-io-9.2.13.v20150730.jar
+%%G%%/lib/jetty-schemas-3.1.M0.jar
+%%G%%/lib/jetty-security-9.2.13.v20150730.jar
+%%G%%/lib/jetty-server-9.2.13.v20150730.jar
+%%G%%/lib/jetty-servlet-9.2.13.v20150730.jar
+%%G%%/lib/jetty-util-9.2.13.v20150730.jar
+%%G%%/lib/jetty-webapp-9.2.13.v20150730.jar
+%%G%%/lib/jetty-xml-9.2.13.v20150730.jar
 %%G%%/lib/jsp-api-2.0.jar
-%%G%%/lib/log4j-1.2.14.jar
-%%G%%/lib/servlet-api-2.5-6.1.8.jar
-%%G%%/lib/servlet-api-2.5.jar
+%%G%%/lib/log4j-1.2.17.jar
 %%G%%/logs/keepme.txt
 @sample %%G%%/resources/log4j.properties.sample
 %%G%%/start.jar
@@ -531,8 +543,8 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/common-2.6.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-beanutils-1.7.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-codec-1.9.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-collections-3.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-dbcp-1.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-collections-3.2.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-dbcp-1.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-fileupload-1.2.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-httpclient-3.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.1.jar
@@ -571,62 +583,61 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-web-wms-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wfs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wms-%%MVER%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-api-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-data-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-graph-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gtopo30-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-api-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-data-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-graph-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gtopo30-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-15.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/guava-17.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-1.8.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-1.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-1.9.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/h2-1.1.119.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.3.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/htmlvalidator-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-1.1.13.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-1.1.13.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-1.1.13.jar
@@ -645,86 +656,84 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-simple-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr-275-1.0-beta-2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr305-2.0.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-1.0.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-attributeop-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-concurrent-tile-cache-1.0.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-contour-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-1.0.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-rangelookup-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-1.0.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-utils-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-1.0.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbinarize-1.4.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorize-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-1.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-1.0.9.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-1.0.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonalstats-1.4.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jts-1.13.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.14.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.17.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-14.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-15.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.json-2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.freemarker-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.json-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.spring-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.simpleframework-3.1.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-15.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/picocontainer-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/pngj-2.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-9.4-1201-jdbc41.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/servlet-api-2.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-api-1.6.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-log4j12-1.6.4.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-asm-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-support-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-core-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-1.3.1.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-3.1.0.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-3.1.0.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-crypto-3.1.0.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-3.1.0.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-3.1.0.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-3.1.4.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-3.1.4.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-support-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-core-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.0.2.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-4.0.4.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-4.0.4.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-4.0.4.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-4.0.4.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-4.2.5.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-4.2.5.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-1.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-api-1.0.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-1.4.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-extensions-1.4.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-ioc-1.4.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-spring-1.4.12.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-core-7.1.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-extensions-7.1.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-request-7.1.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-util-7.1.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-apis-1.4.01.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-apis-ext-1.3.04.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-commons-resolver-1.2.jar