git: b487cc7592b7 - main - graphics/geoserver: Update version 2.20.1=>2.20.2

The branch main has been updated by bofh:

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

commit b487cc7592b723b0335ca2ee1bb8fb1162fb2aac
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-02-15 06:10:56 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-02-15 06:33:48 +0000

    graphics/geoserver: Update version 2.20.1=>2.20.2
    
    Relnotes:
    http://geoserver.org/announcements/2022/01/24/geoserver-2-20-2-released.html
---
 graphics/geoserver/Makefile  |  8 ++++----
 graphics/geoserver/distinfo  |  6 +++---
 graphics/geoserver/pkg-plist | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 1f6f15f2edec..4f726e135e1d 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,7 +1,7 @@
 # Created by: Wen heping<wenheping@gmail.com>
 
 PORTNAME=	geoserver
-PORTVERSION=	2.20.1
+PORTVERSION=	2.20.2
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -23,9 +23,9 @@ GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs modules resources webapps
 
 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=26.1 MVER=${PORTVERSION} \
-		VER3=1.1.3 BATIK=1.14 GWC=1.20.0 ECLIPSE=2.15.0 JETTY=9.4.36.v20210114 \
-		IMAGEIO=1.3.10 JT=1.1.20 JT1=1.6.0 SPRING=5.1.20 SPRINGS=5.1.13 SI=2.0.1 \
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=26.2 MVER=${PORTVERSION} \
+		VER3=1.1.3 BATIK=1.14 GWC=1.20.1 ECLIPSE=2.15.0 JETTY=9.4.36.v20210114 \
+		IMAGEIO=1.3.10 JT=1.1.21 JT1=1.6.0 SPRING=5.1.20 SPRINGS=5.1.13 SI=2.0.1 \
 		WICKET=7.18.0
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index a5ed5b92ac10..f3a200736545 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638663782
-SHA256 (geoserver-2.20.1-bin.zip) = 0df484af828094d6bcfc18cc745891d1647cf320068c3637f656933ab7916db3
-SIZE (geoserver-2.20.1-bin.zip) = 106648851
+TIMESTAMP = 1644898884
+SHA256 (geoserver-2.20.2-bin.zip) = 519bb25509ae661731561da34d01835f25b506543b42afb7eb37b3e8580ca54a
+SIZE (geoserver-2.20.2-bin.zip) = 106633859
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 94e127237122..56c318e1d35f 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -539,7 +539,7 @@
 %%G%%/lib/jetty-webapp-%%JETTY%%.jar
 %%G%%/lib/jetty-xml-%%JETTY%%.jar
 %%G%%/lib/jsp-api-2.0.jar
-%%G%%/lib/log4j-1.2.17.jar
+%%G%%/lib/log4j-1.2.17.norce.jar
 %%G%%/lib/xmlParserAPIs-2.6.2.jar
 %%G%%/logs/keepme.txt
 %%G%%/modules/bytebufferpool.mod
@@ -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.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.9.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.9.0.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/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
@@ -778,7 +778,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonalstats-%%JT1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.18.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.17.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.17.norce.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/marlin-0.9.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-%%VER1%%.jar
@@ -791,7 +791,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.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-5.8.6.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.19.jar