Index: head/databases/geoserver-mysql-plugin/Makefile
===================================================================
--- head/databases/geoserver-mysql-plugin/Makefile	(revision 550724)
+++ head/databases/geoserver-mysql-plugin/Makefile	(revision 550725)
@@ -1,34 +1,34 @@
 # Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.17.2
+PORTVERSION=	2.18.0
 CATEGORIES=	databases geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
 PKGNAMESUFFIX=	-mysql-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	MySQL DataStore implementation for GeoServer
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	${LOCALBASE}/geoserver/start.jar:graphics/geoserver
 
 USES=		zip
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
 SUB_FILES=	pkg-message
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-23.2.jar \
-		${GSLIBDIR}/mysql-connector-java-5.1.46.jar
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-24.0.jar \
+		${GSLIBDIR}/mysql-connector-java-8.0.21.jar
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GSLIBDIR}
 .for f in ${PLIST_FILES:S,^${GSLIBDIR}/,,}
 	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${GSLIBDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/databases/geoserver-mysql-plugin/distinfo
===================================================================
--- head/databases/geoserver-mysql-plugin/distinfo	(revision 550724)
+++ head/databases/geoserver-mysql-plugin/distinfo	(revision 550725)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596948912
-SHA256 (geoserver-2.17.2-mysql-plugin.zip) = 8875748235cb6baf7b1e96a7acb2a409d262e1194a878d82ccc2443d61d37d49
-SIZE (geoserver-2.17.2-mysql-plugin.zip) = 987863
+TIMESTAMP = 1601438357
+SHA256 (geoserver-2.18.0-mysql-plugin.zip) = 815dca999ba1ebed87d8839a5d5d94552a0890c888f879af5a8804906c556f33
+SIZE (geoserver-2.18.0-mysql-plugin.zip) = 2296451