git: dd7f1bc9629f - main - graphics/geoserver: Update to 2.26.2

The branch main has been updated by jbo:

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

commit dd7f1bc9629fd2fb20b89d2274f1f457907d00bb
Author:     Joel Bodenmann <jbo@FreeBSD.org>
AuthorDate: 2025-03-31 10:54:21 +0000
Commit:     Joel Bodenmann <jbo@FreeBSD.org>
CommitDate: 2025-05-01 16:53:58 +0000

    graphics/geoserver: Update to 2.26.2
    
    Changelog: https://geoserver.org/announcements/vulnerability/2025/01/27/geoserver-2-26-2-released.html
    
    PR:     285806
---
 graphics/geoserver/Makefile  | 12 ++++++------
 graphics/geoserver/distinfo  |  6 +++---
 graphics/geoserver/pkg-plist |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 7082f40e66f6..0f7f08be2c05 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	geoserver
-DISTVERSION=	2.26.0
+DISTVERSION=	2.26.2
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -30,18 +30,18 @@ GEODIRS=	data_dir etc lib logs modules resources webapps
 PLIST_SUB=	BATIK=1.17 \
 		ECLIPSE=2.15.0 \
 		G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
-		GT=32.0 \
-		GWC=1.26.0 \
-		IMAGEIO=1.4.13 \
+		GT=32.2 \
+		GWC=1.26.2 \
+		IMAGEIO=1.4.14 \
 		JACKSON=2.17.2 \
-		JETTY=9.4.52.v20230823 \
+		JETTY=9.4.57.v20241219 \
 		JNA=5.14.0 \
 		JT=1.1.27 \
 		JT1=1.6.0 \
 		MVER=${PORTVERSION} \
 		SI=2.2 \
 		SPRING=5.3.39 \
-		SPRINGS=5.8.14 \
+		SPRINGS=5.8.16 \
 		VER3=1.1.3 \
 		WICKET=7.18.0
 
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 04e091d5d532..c5a10c54855a 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727149310
-SHA256 (geoserver-2.26.0-bin.zip) = 59e22d2f48f9d315985c81661f81058478f1bfd5ebeab1b460ef2b7b58d49cd3
-SIZE (geoserver-2.26.0-bin.zip) = 115983509
+TIMESTAMP = 1743417734
+SHA256 (geoserver-2.26.2-bin.zip) = 2b839e3069dccca5d597e9f1c9df6e9ee09da04a7217b8f7eb85717b8f443b1a
+SIZE (geoserver-2.26.2-bin.zip) = 118574340
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 1944e7d96a5a..2b5ac1938ec9 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -586,7 +586,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/batik-transcoder-%%BATIK%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/batik-util-%%BATIK%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%BATIK%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/bcprov-jdk15on-1.69.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/bcprov-jdk18on-1.79.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/bigint-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/checker-qual-3.42.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-beanutils-1.9.4.jar
@@ -819,7 +819,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-core-%%SPRING%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-%%SPRING%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-%%SPRING%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.4.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.4.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-%%SPRINGS%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-%%SPRINGS%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-crypto-%%SPRINGS%%.jar
@@ -847,7 +847,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-commons-resolver-1.2.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/lib/xstream-1.4.21.jar
 %%G%%/webapps/%%G%%/WEB-INF/web.xml
 %%G%%/webapps/%%G%%/index.html
 @dir %%G%%/webapps/%%G%%/WEB-INF/classes