git: 6b5c13dcd6d9 - main - */geoserver*: Update version 2.25.3=>2.26.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 25 Oct 2024 15:55:06 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6b5c13dcd6d951b9c1c85d2faede50333e7232b8
commit 6b5c13dcd6d951b9c1c85d2faede50333e7232b8
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-10-24 20:52:40 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-10-25 15:54:30 +0000
*/geoserver*: Update version 2.25.3=>2.26.0
Changelog: https://geoserver.org/announcements/vulnerability/2024/09/18/geoserver-2-26-0-released.html
---
databases/geoserver-mysql-plugin/Makefile | 4 ++--
databases/geoserver-mysql-plugin/distinfo | 6 ++---
graphics/geoserver/Makefile | 18 +++++++-------
graphics/geoserver/distinfo | 6 ++---
graphics/geoserver/pkg-plist | 40 +++++++++++++++----------------
5 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index 86b3be7972c7..810301f9a5a8 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -1,5 +1,5 @@
PORTNAME= geoserver
-DISTVERSION= 2.25.3
+DISTVERSION= 2.26.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-31.3.jar \
+PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-32.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
index cd2c9b5352e8..b750fc042bc0 100644
--- a/databases/geoserver-mysql-plugin/distinfo
+++ b/databases/geoserver-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722182431
-SHA256 (geoserver-2.25.3-mysql-plugin.zip) = 607c7cebd9d0dceb071cc54d9f58bcce2d8d166f5c7663aa910ab62e02fe74fa
-SIZE (geoserver-2.25.3-mysql-plugin.zip) = 2401179
+TIMESTAMP = 1727150781
+SHA256 (geoserver-2.26.0-mysql-plugin.zip) = ad3d19ad54c703b3e7d517c70d161e855692a4e8b592c70aa69bd03c70ccbdd6
+SIZE (geoserver-2.26.0-mysql-plugin.zip) = 2401169
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 567fb5aa42b2..805b7e5870e1 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,9 +1,10 @@
PORTNAME= geoserver
-DISTVERSION= 2.25.3
+DISTVERSION= 2.26.0
CATEGORIES= graphics geography java
MASTER_SITES= SF/${PORTNAME}/GeoServer/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
+#implicit-approval+ jbo@
MAINTAINER= bofh@FreeBSD.org
COMMENT= Open Source GIS server
WWW= https://geoserver.org/
@@ -30,17 +31,18 @@ GEODIRS= data_dir etc lib logs modules resources webapps
PLIST_SUB= BATIK=1.17 \
ECLIPSE=2.15.0 \
G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
- GT=31.3 \
- GWC=1.25-SNAPSHOT \
- IMAGEIO=1.4.12 \
+ GT=32.0 \
+ GWC=1.26.0 \
+ IMAGEIO=1.4.13 \
+ JACKSON=2.17.2 \
JETTY=9.4.52.v20230823 \
JNA=5.14.0 \
- JT=1.1.25 \
+ JT=1.1.27 \
JT1=1.6.0 \
MVER=${PORTVERSION} \
- SI=2.1 \
- SPRING=5.3.34 \
- SPRINGS=5.7.12 \
+ SI=2.2 \
+ SPRING=5.3.39 \
+ SPRINGS=5.8.14 \
VER3=1.1.3 \
WICKET=7.18.0
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 7b93911cc9f8..04e091d5d532 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722182046
-SHA256 (geoserver-2.25.3-bin.zip) = 1265b78b4aa2ecfe3c01fb42cfbb6a2365adbddcb7729c91e7bface36758c2df
-SIZE (geoserver-2.25.3-bin.zip) = 115551006
+TIMESTAMP = 1727149310
+SHA256 (geoserver-2.26.0-bin.zip) = 59e22d2f48f9d315985c81661f81058478f1bfd5ebeab1b460ef2b7b58d49cd3
+SIZE (geoserver-2.26.0-bin.zip) = 115983509
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 4bd7649f4633..1944e7d96a5a 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -568,7 +568,7 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/JavaAPIforKml-2.2.0.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/aircompressor-0.27.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/antlr4-runtime-4.7.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/apiguardian-api-1.1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/apiguardian-api-1.1.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-%%BATIK%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-%%BATIK%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/batik-bridge-%%BATIK%%.jar
@@ -590,7 +590,7 @@
%%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
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-codec-1.17.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-codec-1.17.1.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/commons-collections-3.2.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/commons-collections4-4.4.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/commons-compiler-3.0.8.jar
@@ -599,7 +599,7 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.16.1.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.14.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-lang3-3.15.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.12.0.jar
@@ -611,7 +611,7 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/error_prone_annotations-2.26.1.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/ezmorph-1.0.6.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/failureaccess-1.0.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/freemarker-2.3.31.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/freemarker-2.3.33.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/gs-gwc-%%MVER%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/gs-gwc-rest-%%MVER%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/gs-kml-%%MVER%%.jar
@@ -687,7 +687,7 @@
%%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-33.2.0-jre.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/guava-33.2.1-jre.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-%%GWC%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-%%GWC%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-%%GWC%%.jar
@@ -712,24 +712,24 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-%%IMAGEIO%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-%%IMAGEIO%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-%%IMAGEIO%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/indriya-%%SI%%.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/indriya-%%SI%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/istack-commons-runtime-3.0.7.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/j2objc-annotations-3.0.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-annotations-%%SI%%7.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-%%SI%%7.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-databind-%%SI%%7.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-dataformat-xml-%%SI%%7.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-annotations-%%JACKSON%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-%%JACKSON%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-databind-%%JACKSON%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-dataformat-xml-%%JACKSON%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jai_codec-%%VER3%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jai_core-%%VER3%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jai_imageio-1.1.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jakarta.activation-1.2.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jakarta.annotation-api-1.3.4.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jakarta.inject-api-2.0.1.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jakarta.mail-1.6.7.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/janino-3.0.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-1.9.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-springsecurity3-1.9.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-1.9.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jasypt-springsecurity3-1.9.3.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/javax.activation-api-1.2.0.jar
-%%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.4.jar
@@ -783,7 +783,7 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-%%JT%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-%%JT%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonalstats-%%JT1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.19.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.20.0.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-api-2.17.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-api-2.17.2.jar
@@ -791,7 +791,7 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-jcl-2.17.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-jul-2.17.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-slf4j-impl-2.17.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/marlin-0.9.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/marlin-0.9.4.8.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/mxparser-1.2.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-%%GT%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-%%GT%%.jar
@@ -804,13 +804,13 @@
%%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-%%GT%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.4.10.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.6.3.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.7.3.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/re2j-1.6.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/si-quantity-2.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/si-units-2.1.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-api-1.7.25.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-%%SPRING%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-%%SPRING%%.jar
@@ -831,9 +831,9 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.41.2.2.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/stax-ex-1.8.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/stax2-api-4.2.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/systems-common-%%SI%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/systems-common-2.1.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/txw2-2.4.0-b180830.0438.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/unit-api-%%SI%%.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/unit-api-%%SI%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/uom-lib-common-%%SI%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-core-%%WICKET%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-dnd-0.7.3.jar