git: 66bc4df17e50 - main - graphics/geoserver: Update version 2.21.0=>2.21.1

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sat, 06 Aug 2022 21:57:41 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=66bc4df17e50c0a97a8d87aa816bcbc35b5fd466

commit 66bc4df17e50c0a97a8d87aa816bcbc35b5fd466
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-08-06 21:10:17 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-08-06 21:57:26 +0000

    graphics/geoserver: Update version 2.21.0=>2.21.1
    
    Relnotes:
    https://geoserver.org/announcements/2022/08/01/geoserver-2-21-1-released.html
---
 graphics/geoserver/Makefile  | 13 +++++++------
 graphics/geoserver/distinfo  |  6 +++---
 graphics/geoserver/pkg-plist |  6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 7a4b628de209..fe6bf788f35e 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	geoserver
-PORTVERSION=	2.21.0
+PORTVERSION=	2.21.1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -29,16 +29,17 @@ GEODIRS=	data_dir etc lib logs modules resources webapps
 PLIST_SUB=	BATIK=1.14 \
 		ECLIPSE=2.15.0 \
 		G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
-		GWC=1.21.0 \
-		IMAGEIO=1.4.4 \
-		JETTY=9.4.44.v20210927 \
+		GWC=1.21.1 \
+		IMAGEIO=1.4.5 \
+		JETTY=9.4.48.v20220622 \
+		JNA=5.12.1 \
 		JT1=1.6.0 \
 		JT=1.1.23 \
 		MVER=${PORTVERSION} \
 		SI=2.0.1 \
-		SPRING=5.2.20 \
+		SPRING=5.2.22 \
 		SPRINGS=5.1.13 \
-		VER1=27.0 \
+		VER1=27.1 \
 		VER3=1.1.3 \
 		WICKET=7.18.0
 
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 404bf3a197f7..7c68a7950767 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654111438
-SHA256 (geoserver-2.21.0-bin.zip) = 502af6d857e19eec7a780d30e6aa1a7f91efbb2a6c97f146a4af9e9a2f06d0c7
-SIZE (geoserver-2.21.0-bin.zip) = 110376595
+TIMESTAMP = 1659818032
+SHA256 (geoserver-2.21.1-bin.zip) = 2e7eef1d4fc9f3479d3896cbde501ecd7ae4fa3250da619663dfbad46ca22d79
+SIZE (geoserver-2.21.1-bin.zip) = 110599589
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 6c344ea92baa..23f510f1ed62 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -726,8 +726,8 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/jaxb-runtime-2.4.0-b180830.0438.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.4.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.10.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.10.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-%%JNA%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-%%JNA%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/joda-time-2.8.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-20180813.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4.2-%%G%%.jar
@@ -797,7 +797,7 @@
 %%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-5.8.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.2.1.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.3.3.jar