git: 62bea5036f0d - 2025Q2 - */geoserver*: Update to 2.27.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 19 May 2025 19:55:05 UTC
The branch 2025Q2 has been updated by jbo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=62bea5036f0d713c2acee58d4490f8ba5a04d743
commit 62bea5036f0d713c2acee58d4490f8ba5a04d743
Author: Joel Bodenmann <jbo@FreeBSD.org>
AuthorDate: 2025-05-08 16:49:26 +0000
Commit: Joel Bodenmann <jbo@FreeBSD.org>
CommitDate: 2025-05-19 19:53:42 +0000
*/geoserver*: Update to 2.27.0
Changelog:
https://geoserver.org/announcements/vulnerability/2025/04/04/geoserver-2-27-0-released.html
(cherry picked from commit 50467b8ed372610536cb8ef5fe2b0007c0805bbe)
---
databases/geoserver-mysql-plugin/Makefile | 4 +--
databases/geoserver-mysql-plugin/distinfo | 6 ++--
graphics/geoserver/Makefile | 18 +++++-----
graphics/geoserver/distinfo | 6 ++--
graphics/geoserver/pkg-plist | 60 ++++++++++++++++---------------
5 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index 488c5d8fa73a..57656dc0b8b5 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -1,5 +1,5 @@
PORTNAME= geoserver
-DISTVERSION= 2.26.2
+DISTVERSION= 2.27.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-32.2.jar \
+PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-33.0.jar \
${GSLIBDIR}/mysql-connector-j-9.1.0.jar
do-install:
diff --git a/databases/geoserver-mysql-plugin/distinfo b/databases/geoserver-mysql-plugin/distinfo
index e0d3744a51f1..db9593e341ed 100644
--- a/databases/geoserver-mysql-plugin/distinfo
+++ b/databases/geoserver-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746690215
-SHA256 (geoserver-2.26.2-mysql-plugin.zip) = 113e777f7771d00743c3e748334c81aa43982d0a17968e5d5fe3562727dc02bc
-SIZE (geoserver-2.26.2-mysql-plugin.zip) = 2492564
+TIMESTAMP = 1746722445
+SHA256 (geoserver-2.27.0-mysql-plugin.zip) = 0edb5c64f8167c36c07ee370aeab94a087403238a3dce9a6094d40ca000999da
+SIZE (geoserver-2.27.0-mysql-plugin.zip) = 2492562
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 0f7f08be2c05..663a3b186725 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,5 +1,5 @@
PORTNAME= geoserver
-DISTVERSION= 2.26.2
+DISTVERSION= 2.27.0
CATEGORIES= graphics geography java
MASTER_SITES= SF/${PORTNAME}/GeoServer/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
@@ -27,23 +27,23 @@ NO_WRKSUBDIR= yes
GEOSERVERDIR= ${PREFIX}/${PORTNAME}
GEODIRS= data_dir etc lib logs modules resources webapps
-PLIST_SUB= BATIK=1.17 \
+PLIST_SUB= BATIK=1.18 \
ECLIPSE=2.15.0 \
G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
- GT=32.2 \
- GWC=1.26.2 \
- IMAGEIO=1.4.14 \
- JACKSON=2.17.2 \
+ GT=33.0 \
+ GWC=1.27.0 \
+ IMAGEIO=1.4.15 \
+ JACKSON=2.18.2 \
JETTY=9.4.57.v20241219 \
- JNA=5.14.0 \
- JT=1.1.27 \
+ JNA=5.16.0 \
+ JT=1.1.31 \
JT1=1.6.0 \
MVER=${PORTVERSION} \
SI=2.2 \
SPRING=5.3.39 \
SPRINGS=5.8.16 \
VER3=1.1.3 \
- WICKET=7.18.0
+ WICKET=9.20.0
post-patch:
@${REINPLACE_CMD} -e 's|$$GEOSERVER_HOME|${GEOSERVERDIR}|g' \
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index c5a10c54855a..7ba3526f67ea 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743417734
-SHA256 (geoserver-2.26.2-bin.zip) = 2b839e3069dccca5d597e9f1c9df6e9ee09da04a7217b8f7eb85717b8f443b1a
-SIZE (geoserver-2.26.2-bin.zip) = 118574340
+TIMESTAMP = 1746718969
+SHA256 (geoserver-2.27.0-bin.zip) = 6e12febbe0682a05b67303971336aad21d3b74a173f6ef560768d6f27005d2f2
+SIZE (geoserver-2.27.0-bin.zip) = 121680271
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 2b5ac1938ec9..b8c71f098752 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -532,7 +532,7 @@
%%G%%/lib/ant-1.10.11.jar
%%G%%/lib/ant-launcher-1.10.11.jar
%%G%%/lib/commons-el-1.0.jar
-%%G%%/lib/commons-logging-1.2.jar
+%%G%%/lib/commons-logging-1.3.5.jar
%%G%%/lib/javax.servlet-api-3.1.0.jar
%%G%%/lib/jetty-continuation-%%JETTY%%.jar
%%G%%/lib/jetty-deploy-%%JETTY%%.jar
@@ -562,6 +562,8 @@
%%G%%/resources/log4j.properties
%%G%%/start.ini
%%G%%/start.jar
+%%G%%/webapps/%%G%%/accessDenied.html
+%%G%%/webapps/%%G%%/index.html
%%G%%/webapps/%%G%%/WEB-INF/dispatcher-servlet.xml
%%G%%/webapps/%%G%%/WEB-INF/lib/FastInfoset-1.2.15.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/GeographicLib-Java-1.49.jar
@@ -588,30 +590,30 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%BATIK%%.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
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-codec-1.17.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/checker-qual-3.43.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-beanutils-1.10.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-codec-1.18.0.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
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-compiler-3.1.12.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.16.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.18.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.15.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-logging-1.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-lang-2.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-lang3-3.17.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-logging-1.3.5.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
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-text-1.13.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.2.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/error_prone_annotations-2.26.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/encoder-1.3.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/error_prone_annotations-2.36.0.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.33.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/freemarker-2.3.34.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
@@ -662,6 +664,7 @@
%%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-main-%%GT%%-tests.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
@@ -687,7 +690,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.1-jre.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/guava-33.4.0-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
@@ -726,12 +729,13 @@
%%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/janino-3.1.12.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/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/jdk-serializable-functional-1.9.0.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.5.4.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.3.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/jna-%%JNA%%.jar
@@ -785,12 +789,12 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonalstats-%%JT1%%.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
-%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-core-2.17.2.jar
-%%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/log4j-1.2-api-2.24.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-api-2.24.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-core-2.24.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-jcl-2.24.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-jul-2.24.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/log4j-slf4j2-impl-2.24.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
@@ -798,20 +802,21 @@
%%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/openjson-1.0.13.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-%%GT%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.6.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.6.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.7.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/re2j-1.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.7.5.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/re2j-1.8.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/slf4j-api-2.0.16.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-%%SPRING%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-%%SPRING%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/spring-context-%%SPRING%%.jar
@@ -840,16 +845,15 @@
%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-extensions-%%WICKET%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-request-%%WICKET%%.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-util-%%WICKET%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-webjars-0.5.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-webjars-3.0.0.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/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
+%%G%%/webapps/%%G%%/WEB-INF/lib/xmlgraphics-commons-2.10.jar
%%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-%%VER3%%.1.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
@sample %%G%%/etc/jdbcRealm.properties.sample
@sample %%G%%/etc/jetty-bytebufferpool.xml.sample