From 54bdb8be2876ab33ae65934f97c72db5e60e8f17 Mon Sep 17 00:00:00 2001
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Date: Thu, 2 Feb 2023 05:48:49 -0600
Subject: [PATCH] graphics/geoserver: Update version 2.22.0=>2.22.1

Relnotes:
https://geoserver.org/announcements/2023/01/24/geoserver-2-22-1-released.html
---
 graphics/geoserver/Makefile  | 8 ++++----
 graphics/geoserver/distinfo  | 6 +++---
 graphics/geoserver/pkg-plist | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 90cb32f35663..5b8c4506c0fc 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	geoserver
-PORTVERSION=	2.22.0
+PORTVERSION=	2.22.1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -27,10 +27,10 @@ NO_WRKSUBDIR=	yes
 GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs modules resources webapps
 
-PLIST_SUB=	BATIK=1.14 \
+PLIST_SUB=	BATIK=1.16 \
 		ECLIPSE=2.15.0 \
 		G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
-		GWC=1.22.0 \
+		GWC=1.21.3 \
 		IMAGEIO=1.4.7 \
 		JETTY=9.4.48.v20220622 \
 		JNA=5.12.1 \
@@ -40,7 +40,7 @@ PLIST_SUB=	BATIK=1.14 \
 		SI=2.0.1 \
 		SPRING=5.2.22 \
 		SPRINGS=5.1.13 \
-		VER1=28.0 \
+		VER1=28.1 \
 		VER3=1.1.3 \
 		WICKET=7.18.0
 
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index a8d060b36330..955522850651 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669556253
-SHA256 (geoserver-2.22.0-bin.zip) = ebcf88bdb3820634dd060e5d41bfb2769da7b6dd3b7ef5b09b800b73a9b568de
-SIZE (geoserver-2.22.0-bin.zip) = 116922248
+TIMESTAMP = 1675279405
+SHA256 (geoserver-2.22.1-bin.zip) = fb1a56be952b2de946a8bb9359c8801d27f5c1fdbe5c27d9d2a0ce8be2041d73
+SIZE (geoserver-2.22.1-bin.zip) = 117040223
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index c85d5ed97657..c68e54d39280 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -715,7 +715,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/h2-1.1.119.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.4.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.7.1-jdk8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-4.5.13.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-cache-4.5.13.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpcore-4.4.10.jar
@@ -746,7 +746,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/javax.inject-1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jaxb-api-2.4.0-b180830.0359.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jaxb-runtime-2.4.0-b180830.0438.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.5.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.5.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jna-%%JNA%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-%%JNA%%.jar
@@ -824,7 +824,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.2.2.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.4.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.4.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/re2j-1.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/serializer-2.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-quantity-%%SI%%.jar
@@ -864,7 +864,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.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/xmlgraphics-commons-2.7.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-%%VER3%%.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xstream-1.4.19.jar
 %%G%%/webapps/%%G%%/WEB-INF/web.xml