git: a98a22c9a920 - main - graphics/geoserver: Update version 2.23.2=>2.24.0

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Mon, 16 Oct 2023 14:02:35 UTC
The branch main has been updated by bofh:

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

commit a98a22c9a920e46bd1126a55bed96dc75fc6d839
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-10-16 14:00:14 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-10-16 14:02:24 +0000

    graphics/geoserver: Update version 2.23.2=>2.24.0
    
    Changelog:
    https://geoserver.org/announcements/2023/10/15/geoserver-2-24-0-released.html
---
 graphics/geoserver/Makefile  |  14 ++---
 graphics/geoserver/distinfo  |   6 +--
 graphics/geoserver/pkg-plist | 119 ++++++++++++++++++++-----------------------
 3 files changed, 65 insertions(+), 74 deletions(-)

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 68d90a8edaa4..14624c7e5c23 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	geoserver
-PORTVERSION=	2.23.2
+PORTVERSION=	2.24.0
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -27,20 +27,20 @@ NO_WRKSUBDIR=	yes
 GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs modules resources webapps
 
-PLIST_SUB=	BATIK=1.16 \
+PLIST_SUB=	BATIK=1.17 \
 		ECLIPSE=2.15.0 \
 		G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
-		GWC=1.23.1 \
+		GT=30.0 \
+		GWC=1.24.0 \
 		IMAGEIO=1.4.7 \
-		JETTY=9.4.51.v20230217 \
+		JETTY=9.4.52.v20230823 \
 		JNA=5.12.1 \
-		JT1=1.6.0 \
 		JT=1.1.24 \
+		JT1=1.6.0 \
 		MVER=${PORTVERSION} \
 		SI=2.1 \
 		SPRING=5.3.27 \
-		SPRINGS=5.7.8 \
-		VER1=29.2 \
+		SPRINGS=5.7.10 \
 		VER3=1.1.3 \
 		WICKET=7.18.0
 
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index d76b4f2944ce..1cfcc9be9906 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690898725
-SHA256 (geoserver-2.23.2-bin.zip) = e333ad71459e6ffcee6c4637c0d09805e4ad45281ad9b9b506705afaa732782c
-SIZE (geoserver-2.23.2-bin.zip) = 118299233
+TIMESTAMP = 1697463275
+SHA256 (geoserver-2.24.0-bin.zip) = c57d6b00e34c8795d25863d791531e980bc6df80c3366bb6d35f07b13bd8ec6d
+SIZE (geoserver-2.24.0-bin.zip) = 118441439
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 7fc02d0c4d9b..548be94ad9a9 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -1,16 +1,7 @@
-%%G%%/EPSG.html
-%%G%%/GEOTOOLS_NOTICE.html
-%%G%%/HSQL.html
-%%G%%/LGPL.html
-%%G%%/NOTICE.html
 %%G%%/NOTICE.txt
-%%G%%/OGC.html
 %%G%%/README.html
 %%G%%/RUNNING.html
 %%G%%/VERSION.txt
-%%G%%/W3C.html
-%%G%%/apache-1.1.html
-%%G%%/apache-2.0.html
 %%G%%/bin/shutdown.sh
 %%G%%/bin/startup.sh
 %%G%%/data_dir/README.rst
@@ -538,7 +529,6 @@
 %%G%%/data_dir/www/styles/remoteOws.sld
 %%G%%/data_dir/www/styles/remoteTasmania.sld
 %%G%%/data_dir/www/wfs-t.html
-%%G%%/epl-1.0.html
 %%G%%/lib/ant-1.10.11.jar
 %%G%%/lib/ant-launcher-1.10.11.jar
 %%G%%/lib/commons-el-1.0.jar
@@ -608,7 +598,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-compiler-3.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-dbcp-1.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-fileupload-1.5.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.8.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.12.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-jxpath-1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-lang-2.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-lang3-3.12.0.jar
@@ -654,50 +644,51 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-web-wms-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wfs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wms-%%MVER%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-core-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geopkg-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gml-geometry-streaming-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-http-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-http-commons-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-tile-client-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wmts-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wmts-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-api-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-brewer-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-core-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geopkg-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gml-geometry-streaming-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-http-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-http-commons-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-tile-client-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wmts-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wmts-%%GT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/guava-32.0.0-jre.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-%%GWC%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-%%GWC%%.jar
@@ -710,7 +701,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-%%GWC%%.jar
 %%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/hsqldb-2.7.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-4.5.14.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpclient-cache-4.5.14.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/httpcore-4.4.16.jar
@@ -746,7 +737,7 @@
 %%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-20230618.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-lib-2.4.2-%%G%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr305-2.0.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-%%JT%%.jar
@@ -803,17 +794,17 @@
 %%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/mxparser-1.2.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-%%GT%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-%%GT%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/openpdf-1.3.26.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.common-2.15.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.eclipse.emf.ecore-2.15.0.jar
 %%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/org.w3.xlink-%%GT%%.jar
 %%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
@@ -857,7 +848,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/xalan-2.7.3.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.7.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/xmlgraphics-commons-2.9.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-%%VER3%%.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xstream-1.4.20.jar
 %%G%%/webapps/%%G%%/WEB-INF/web.xml