diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index c669a9170faa..82d21d8f039b 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	geoserver
-PORTVERSION=	2.21.1
+PORTVERSION=	2.22.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
 WWW=		http://geoserver.org/display/GEOSDOC/MySQL+DataStore
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	${LOCALBASE}/geoserver/start.jar:graphics/geoserver
 
 USES=		cpe zip
 
 CPE_VENDOR=	osgeo
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-27.1.jar \
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-28.0.jar \
 		${GSLIBDIR}/mysql-connector-java-8.0.28.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>
diff --git a/databases/geoserver-mysql-plugin/distinfo b/databases/geoserver-mysql-plugin/distinfo
index 39fcd17081cf..3efd7769533c 100644
--- a/databases/geoserver-mysql-plugin/distinfo
+++ b/databases/geoserver-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659819243
-SHA256 (geoserver-2.21.1-mysql-plugin.zip) = d085aa24e5778cf1000544fd3c3cb97bec957812c9c1872070cdd7d08285c8df
-SIZE (geoserver-2.21.1-mysql-plugin.zip) = 2374673
+TIMESTAMP = 1669558368
+SHA256 (geoserver-2.22.0-mysql-plugin.zip) = 923242f830cd02b9ef7639890ad8076f138b9c9c7979317015068070dca85513
+SIZE (geoserver-2.22.0-mysql-plugin.zip) = 2364726