graphics/geoserver{-mysql}: Update version 2.24.2=>2.25.0

Changelog: https://geoserver.org/announcements/vulnerability/2024/03/19/geoserver-2-25-0-released.html
freebsd · Mar 20, 2024 · d47f088 · d47f088
1 parent 41b54c3
commit d47f088
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	geoserver
-PORTVERSION=	2.24.2
+PORTVERSION=	2.25.0
 CATEGORIES=	databases geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
 PKGNAMESUFFIX=	-mysql-plugin
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-30.2.jar \
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-31.0.jar \
 		${GSLIBDIR}/mysql-connector-java-8.0.28.jar
 
 do-install:

diff --git a/databases/geoserver-mysql-plugin/distinfo b/databases/geoserver-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706274824
-SHA256 (geoserver-2.24.2-mysql-plugin.zip) = db5651e7b33d03f758152b51e945d1eab6cb3923f9e8989809bec9d311da5350
-SIZE (geoserver-2.24.2-mysql-plugin.zip) = 2401167
+TIMESTAMP = 1710925527
+SHA256 (geoserver-2.25.0-mysql-plugin.zip) = 9fef356a3121d0b8b4fbd42b20cdba977852205d440c9f8f02490ae236658ae7
+SIZE (geoserver-2.25.0-mysql-plugin.zip) = 2401181
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	geoserver
-PORTVERSION=	2.24.2
+PORTVERSION=	2.25.0
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -30,17 +30,17 @@ GEODIRS=	data_dir etc lib logs modules resources webapps
 PLIST_SUB=	BATIK=1.17 \
 		ECLIPSE=2.15.0 \
 		G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
-		GT=30.2 \
-		GWC=1.24.2 \
-		IMAGEIO=1.4.7 \
+		GT=31.0 \
+		GWC=1.25.0 \
+		IMAGEIO=1.4.9 \
 		JETTY=9.4.52.v20230823 \
 		JNA=5.14.0 \
-		JT=1.1.24 \
+		JT=1.1.25 \
 		JT1=1.6.0 \
 		MVER=${PORTVERSION} \
 		SI=2.1 \
-		SPRING=5.3.27 \
-		SPRINGS=5.7.10 \
+		SPRING=5.3.32 \
+		SPRINGS=5.7.11 \
 		VER3=1.1.3 \
 		WICKET=7.18.0
 

diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706273679
-SHA256 (geoserver-2.24.2-bin.zip) = d40ac6ec29de25163dcbaad86958cd53a2fa46c52056f8e9c2dd3b45df961ab1
-SIZE (geoserver-2.24.2-bin.zip) = 118784621
+TIMESTAMP = 1710924933
+SHA256 (geoserver-2.25.0-bin.zip) = 99a583451228e4caa36fa2b5356169966430bc9f5f2d71a77a565cb25c29e0ea
+SIZE (geoserver-2.25.0-bin.zip) = 115312897
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
@@ -547,7 +547,6 @@
 %%G%%/lib/jetty-util-ajax-%%JETTY%%.jar
 %%G%%/lib/jetty-webapp-%%JETTY%%.jar
 %%G%%/lib/jetty-xml-%%JETTY%%.jar
-%%G%%/lib/xmlParserAPIs-2.6.2.jar
 %%G%%/logs/keepme.txt
 %%G%%/modules/bytebufferpool.mod
 %%G%%/modules/deploy.mod
@@ -600,15 +599,15 @@
 %%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
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-lang3-3.14.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-logging-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-pool-1.5.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-text-1.10.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/disruptor-1.2.15.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/ehcache-3.4.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/ejml-core-0.41.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/ejml-ddense-0.41.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/encoder-1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/encoder-1.2.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/error_prone_annotations-%%SI%%8.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/ezmorph-1.0.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/failureaccess-1.0.1.jar
@@ -808,9 +807,8 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.4.10.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.6.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/re2j-1.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/serializer-2.7.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-quantity-%%SI%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-units-%%SI%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-api-1.7.25.jar
@@ -845,7 +843,6 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-webjars-0.5.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicketstuff-select2-%%WICKET%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/woodstox-core-6.4.0.jar
-%%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.9.jar