diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index b7fd56156365..8efc5ebadfd0 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.17.1
+PORTVERSION=	2.17.2
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -24,9 +24,9 @@ GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs modules resources webapps
 
 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=23.1 MVER=${PORTVERSION} \
-		VER3=1.1.3 BATIK=1.10 GWC=1.17.1 \
-		JETTY=9.4.18.v20190429 IMAGEIO=1.3.2 JT=1.1.14 SPRINGS=5.1.8
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=23.2 MVER=${PORTVERSION} \
+		VER3=1.1.3 BATIK=1.10 GWC=1.17.2 ECLIPSE=2.15.0 JETTY=9.4.18.v20190429 \
+		IMAGEIO=1.3.2 JT=1.1.15 SPRING=5.1.16 SPRINGS=5.1.11
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 28d30797d6c4..00d99dbeaa1c 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591212412
-SHA256 (geoserver-2.17.1-bin.zip) = 9ee69f896fb1e5f8b3d7adaff910ffccb70fcae803ccf974bc436bed8950704f
-SIZE (geoserver-2.17.1-bin.zip) = 107352398
+TIMESTAMP = 1596879486
+SHA256 (geoserver-2.17.2-bin.zip) = 2469c4f8735dea0604dabe975c37663bbaf9adc569cc888ce24b9e987dc06400
+SIZE (geoserver-2.17.2-bin.zip) = 107709744
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 1f3801805711..3cefb9442e9b 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -771,36 +771,36 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.common-2.12.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore-2.12.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.12.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.common-2.15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore-2.15.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.xsd-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-3.13.3.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-42.2.5.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.2.14.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/serializer-2.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-quantity-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-units-java8-0.7.1.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-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-support-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-core-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jcl-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-support-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-core-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jcl-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-%%SPRING%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.3.2.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-web-%%SPRINGS%%.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-5.1.13.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-5.1.13.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-tx-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-web-%%SPRING%%.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-%%SPRING%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.30.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-1.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-api-1.0.1.jar