graphics/geoserver: Update version 2.19.2=>2.20.0

Relnotes: http://geoserver.org/announcements/2021/10/18/geoserver-2-20-released.html

4 files changed, 23 insertions, 21 deletions

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 30d624ae71b6..4badb98a5edf 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,7 +1,7 @@
 # Created by: Wen heping<wenheping@gmail.com>
 
 PORTNAME=	geoserver
-PORTVERSION=	2.19.2
+PORTVERSION=	2.20.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=25.2 MVER=${PORTVERSION} \
-		VER3=1.1.3 BATIK=1.14 GWC=1.19.1 ECLIPSE=2.15.0 JETTY=9.4.36.v20210114 \
-		IMAGEIO=1.3.9 JT=1.1.20 JT1=1.6.0 SPRING=5.1.20 SPRINGS=5.1.13 SI=2.0.1 \
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" VER1=26.0 MVER=${PORTVERSION} \
+		VER3=1.1.3 BATIK=1.14 GWC=1.20.0 ECLIPSE=2.15.0 JETTY=9.4.36.v20210114 \
+		IMAGEIO=1.3.10 JT=1.1.20 JT1=1.6.0 SPRING=5.1.20 SPRINGS=5.1.13 SI=2.0.1 \
 		WICKET=7.18.0
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 2f7759b10d5c..041afa87b980 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632747472
-SHA256 (geoserver-2.19.2-bin.zip) = 1e6d117310f14cadf987ee05647f0748d74260898d0a72b80e93c7c8fb3e6c08
-SIZE (geoserver-2.19.2-bin.zip) = 103982460
+TIMESTAMP = 1635436435
+SHA256 (geoserver-2.20.0-bin.zip) = 38e1b0b72559eca7c4850d6d48f729083dbd28b32668a9d46d6172ec6dec41e4
+SIZE (geoserver-2.20.0-bin.zip) = 106636870
diff --git a/graphics/geoserver/files/patch-bin_shutdown.sh b/graphics/geoserver/files/patch-bin_shutdown.sh
index 41164a9859cf..3108fcfb10bf 100644
--- a/graphics/geoserver/files/patch-bin_shutdown.sh
+++ b/graphics/geoserver/files/patch-bin_shutdown.sh
@@ -1,8 +1,8 @@
---- bin/shutdown.sh.orig	2016-05-28 00:30:28 UTC
+--- bin/shutdown.sh.orig	2021-09-14 02:52:16 UTC
 +++ bin/shutdown.sh
-@@ -60,4 +60,4 @@ if [ ! -r "$GEOSERVER_HOME"/start.jar ];
+@@ -65,4 +65,4 @@ if [ ! -r "${GEOSERVER_HOME}/start.jar" ]; then
  fi
  
- cd "$GEOSERVER_HOME"
--exec "$_RUNJAVA" $JAVA_OPTS -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar --stop
+ cd "${GEOSERVER_HOME}" || exit 1
+-exec "${_RUNJAVA}" "${JAVA_OPTS:--DnoJavaOpts}" -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar --stop
 +exec %%JAVA%% -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar --stop
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 2c6c3b44e27b..94e127237122 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -517,8 +517,8 @@
 @sample %%G%%/etc/realm.properties.sample
 @sample %%G%%/etc/webdefault.xml.sample
 %%G%%/lib/ant-1.6.5.jar
-%%G%%/lib/ant-1.10.9.jar
-%%G%%/lib/ant-launcher-1.10.9.jar
+%%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.1.1.jar
 %%G%%/lib/jasper-compiler-5.5.15.jar
@@ -561,6 +561,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/GeographicLib-Java-1.49.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/JavaAPIforKml-2.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/activation-1.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/aircompressor-0.20.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/antlr4-runtime-4.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/batik-anim-%%BATIK%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/batik-awt-util-%%BATIK%%.jar
@@ -579,7 +580,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.60.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/bcprov-jdk15on-1.69.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/bigint-0.7.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/checker-qual-3.5.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-beanutils-1.9.4.jar
@@ -607,6 +608,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/failureaccess-1.0.1.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/gt-gml-geometry-streaming-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-kml-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-main-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-ows-%%MVER%%.jar
@@ -708,7 +710,9 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/istack-commons-runtime-3.0.7.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/itext-2.1.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/j2objc-annotations-1.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-annotations-2.10.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-2.10.5.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-databind-2.10.5.1.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
@@ -720,11 +724,10 @@
 %%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/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.7.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.7.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-5.9.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-5.9.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
@@ -773,7 +776,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.18.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.18.2.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
@@ -788,7 +791,7 @@
 %%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.5.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-5.8.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.19.jar
@@ -817,7 +820,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-1.2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-api-1.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-ex-1.8.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/systems-common-2.0.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/systems-common-2.0.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/txw2-2.4.0-b180830.0438.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/unit-api-2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/uom-lib-common-2.0.jar
@@ -835,7 +838,6 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-commons-resolver-1.2.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
 %%G%%/webapps/%%G%%/WEB-INF/lib/xstream-1.4.11.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/web.xml