3 files changed, 42 insertions, 35 deletions

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 5660e0eecba4..71eba6c7bf60 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.13.1
+PORTVERSION=	2.13.2
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -22,8 +22,8 @@ GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs resources webapps
 
 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=19.1 MVER=${PORTVERSION} \
-		VER2=1.13.1 VER3=1.0.22
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=19.2 MVER=${PORTVERSION} \
+		VER2=1.13.2 VER3=1.0.24 VER4=1.10 VER5=1.1.24
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 3b79316fb6ea..8a6965624891 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532266619
-SHA256 (geoserver-2.13.1-bin.zip) = a7f619c76e964157da5fd082a9b1db2130050101f5b9eccd6888afa1d675cae0
-SIZE (geoserver-2.13.1-bin.zip) = 89747066
+TIMESTAMP = 1532473129
+SHA256 (geoserver-2.13.2-bin.zip) = a8bbfe1341014ff99eab3b6ada8f19ad0f7d2133e38a3a06b8aac9db79f99f4d
+SIZE (geoserver-2.13.2-bin.zip) = 91805673
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index e472828728b1..5fda5255e9fd 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -538,32 +538,35 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/GeographicLib-Java-1.44.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/JavaAPIforKml-2.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/activation-1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/animal-sniffer-annotations-1.14.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/aopalliance-1.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-bridge-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-css-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-dom-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-ext-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-gvt-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-js-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-parser-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-script-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svg-dom-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svggen-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-transcoder-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-util-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-1.7.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/bcprov-jdk15on-1.54.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-bridge-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-constants-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-css-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-dom-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-ext-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-gvt-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-i18n-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-parser-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-script-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svg-dom-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-svggen-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-transcoder-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-util-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%VER4%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/bcprov-jdk15on-1.60.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/cglib-nodep-2.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/checker-qual-2.0.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-beanutils-1.9.2-noclassprop.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-codec-1.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-collections-3.2.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-collections4-4.1.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-fileupload-1.3.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-httpclient-3.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-jxpath-1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-lang-2.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-logging-1.1.1.jar
@@ -572,6 +575,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/ejml-core-0.32.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/ejml-ddense-0.32.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/encoder-1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/error_prone_annotations-2.1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/ezmorph-1.0.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/freemarker-2.3.18.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-gwc-%%MVER%%.jar
@@ -616,7 +620,6 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-geopkg-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gtopo30-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-%%VER1%%.jar
@@ -649,7 +652,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wmts-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/guava-17.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/guava-25.1-jre.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-%%VER2%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-%%VER2%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-%%VER2%%.jar
@@ -662,23 +665,25 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-%%VER2%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-%%VER2%%.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/imageio-ext-arcgrid-1.1.20.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-1.1.20.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-1.1.20.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-1.1.20.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-1.1.20.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-1.1.20.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.4.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-%%VER5%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-%%VER5%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-%%VER5%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-%%VER5%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-%%VER5%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-%%VER5%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/itext-2.1.5.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/j2objc-annotations-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-2.5.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_codec-1.1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_core-1.1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_imageio-1.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-1.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-1.9.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-springsecurity3-1.9.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jdom2-2.0.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-1.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.2.3-jdk15.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4-jdk15.jar
 %%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
@@ -710,6 +715,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-%%VER3%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale2-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-%%VER3%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-%%VER3%%.jar
@@ -771,6 +777,7 @@
 %%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
+%%G%%/webapps/%%G%%/WEB-INF/lib/xmlgraphics-commons-2.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-1.1.3.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xpp3-1.1.3.4.O.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xpp3_min-1.1.4c.jar