3 files changed, 25 insertions, 17 deletions

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index e6041c84ee27..6c6e6b13148f 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,7 +1,7 @@
 # Created by: Wen heping<wenheping@gmail.com>
 
 PORTNAME=	geoserver
-PORTVERSION=	2.18.2
+PORTVERSION=	2.19.0
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -23,9 +23,9 @@ GEOSERVERDIR=	${PREFIX}/${PORTNAME}
 GEODIRS=	data_dir etc lib logs modules resources webapps
 
 USE_RC_SUBR=	${PORTNAME}
-PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=24.2 MVER=${PORTVERSION} \
-		VER3=1.1.3 BATIK=1.13 GWC=1.18.2 ECLIPSE=2.15.0 JETTY=9.4.18.v20190429 \
-		IMAGEIO=1.3.5 JT=1.1.18 JT1=1.6.0 SPRING=5.1.16 SPRINGS=5.1.11 SI=2.0.1
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=25.0 MVER=${PORTVERSION} \
+		VER3=1.1.3 BATIK=1.14 GWC=1.19.0 ECLIPSE=2.15.0 JETTY=9.4.36.v20210114 \
+		IMAGEIO=1.3.5 JT=1.1.20 JT1=1.6.0 SPRING=5.1.20 SPRINGS=5.1.13 SI=2.0.1
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index e44ae95413f7..8ce8f8622c48 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611710472
-SHA256 (geoserver-2.18.2-bin.zip) = 66aaf2eb0a8704e832a12cba012af9ff78a8f78cc9904e551c293e2defd5210c
-SIZE (geoserver-2.18.2-bin.zip) = 101632281
+TIMESTAMP = 1617819675
+SHA256 (geoserver-2.19.0-bin.zip) = ce9efaa04a74e8ce7910d3a97102a95b758ac1989106e9d906b75104bc188eaa
+SIZE (geoserver-2.19.0-bin.zip) = 103845464
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 8eae90d93cbe..a8e76c0817e4 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -502,6 +502,7 @@
 %%G%%/data_dir/www/wfs-t.html
 %%G%%/epl-1.0.txt
 @sample %%G%%/etc/jdbcRealm.properties.sample
+@sample %%G%%/etc/jetty-bytebufferpool.xml.sample
 @sample %%G%%/etc/jetty-deploy.xml.sample
 @sample %%G%%/etc/jetty-http.xml.sample
 @sample %%G%%/etc/jetty-https.xml.sample
@@ -509,13 +510,15 @@
 @sample %%G%%/etc/jetty-jmx.xml.sample
 @sample %%G%%/etc/jetty-plus.xml.sample
 @sample %%G%%/etc/jetty-ssl.xml.sample
+@sample %%G%%/etc/jetty-threadpool.xml.sample
+@sample %%G%%/etc/jetty-webapp.xml.sample
 @sample %%G%%/etc/jetty.xml.sample
 @sample %%G%%/etc/keystore.sample
 @sample %%G%%/etc/realm.properties.sample
 @sample %%G%%/etc/webdefault.xml.sample
 %%G%%/lib/ant-1.6.5.jar
-%%G%%/lib/ant-1.8.4.jar
-%%G%%/lib/ant-launcher-1.8.4.jar
+%%G%%/lib/ant-1.10.9.jar
+%%G%%/lib/ant-launcher-1.10.9.jar
 %%G%%/lib/commons-el-1.0.jar
 %%G%%/lib/commons-logging-1.1.1.jar
 %%G%%/lib/jasper-compiler-5.5.15.jar
@@ -532,12 +535,14 @@
 %%G%%/lib/jetty-servlet-%%JETTY%%.jar
 %%G%%/lib/jetty-servlets-%%JETTY%%.jar
 %%G%%/lib/jetty-util-%%JETTY%%.jar
+%%G%%/lib/jetty-util-ajax-%%JETTY%%.jar
 %%G%%/lib/jetty-webapp-%%JETTY%%.jar
 %%G%%/lib/jetty-xml-%%JETTY%%.jar
 %%G%%/lib/jsp-api-2.0.jar
 %%G%%/lib/log4j-1.2.17.jar
 %%G%%/lib/xmlParserAPIs-2.6.2.jar
 %%G%%/logs/keepme.txt
+%%G%%/modules/bytebufferpool.mod
 %%G%%/modules/deploy.mod
 %%G%%/modules/http.mod
 %%G%%/modules/https.mod
@@ -546,6 +551,7 @@
 %%G%%/modules/server.mod
 %%G%%/modules/servlet.mod
 %%G%%/modules/servlets.mod
+%%G%%/modules/threadpool.mod
 %%G%%/modules/webapp.mod
 %%G%%/resources/log4j.properties
 %%G%%/start.ini
@@ -599,7 +605,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/error_prone_annotations-2.3.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/ezmorph-1.0.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/failureaccess-1.0.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/freemarker-2.3.18.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/freemarker-2.3.31.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-gwc-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-kml-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-main-%%MVER%%.jar
@@ -638,6 +644,8 @@
 %%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-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
@@ -715,8 +723,8 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/jdom2-2.0.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.6.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.6.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.7.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.7.0.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-lib-2.4.2-%%G%%.jar
@@ -765,7 +773,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.17.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.18.1.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.17.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
@@ -780,10 +788,10 @@
 %%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/oshi-core-5.3.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-5.5.1.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.2.18.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.2.19.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/serializer-2.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-quantity-%%SI%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-units-%%SI%%.jar
@@ -797,7 +805,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-expression-%%SPRING%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-jcl-%%SPRING%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-jdbc-%%SPRING%%.RELEASE.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.3.2.RELEASE.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/spring-ldap-core-2.3.3.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-config-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-core-%%SPRINGS%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-security-ldap-%%SPRINGS%%.RELEASE.jar
@@ -825,7 +833,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-apis-1.4.01.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.4.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/xmlgraphics-commons-2.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-%%VER3%%.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xpp3-%%VER3%%.4.O.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xpp3_min-1.1.4c.jar