git: 47fb4ac10429 - main - graphics/geoserver: Update version 2.21.1=>2.22.0

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sun, 27 Nov 2022 15:08:42 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=47fb4ac104292721baeb0146145ee0f2127fd404

commit 47fb4ac104292721baeb0146145ee0f2127fd404
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-11-27 14:11:40 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-11-27 15:08:33 +0000

    graphics/geoserver: Update version 2.21.1=>2.22.0
    
    Relnotes:
    https://geoserver.org/announcements/vulnerability/2022/11/18/geoserver-2-22-0-released.html
---
 graphics/geoserver/Makefile  |  14 +++---
 graphics/geoserver/distinfo  |   6 +--
 graphics/geoserver/pkg-plist | 116 +++++++++++++++++++++++++++++--------------
 3 files changed, 88 insertions(+), 48 deletions(-)

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 0e6655f35468..90cb32f35663 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	geoserver
-PORTVERSION=	2.21.1
+PORTVERSION=	2.22.0
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -10,7 +10,7 @@ WWW=		https://geoserver.org/
 
 LICENSE=	APACHE20 BSD2CLAUSE EPL GPLv2 GPLv3 MIT
 LICENSE_COMB=	multi
-LICENSE_FILE=	${WRKSRC}/NOTICE.md
+LICENSE_FILE=	${WRKSRC}/license/NOTICE.txt
 
 USES=		cpe zip
 USE_JAVA=	yes
@@ -30,17 +30,17 @@ GEODIRS=	data_dir etc lib logs modules resources webapps
 PLIST_SUB=	BATIK=1.14 \
 		ECLIPSE=2.15.0 \
 		G="${GEOSERVERDIR:S,^${PREFIX}/,,}" \
-		GWC=1.21.1 \
-		IMAGEIO=1.4.5 \
+		GWC=1.22.0 \
+		IMAGEIO=1.4.7 \
 		JETTY=9.4.48.v20220622 \
 		JNA=5.12.1 \
 		JT1=1.6.0 \
-		JT=1.1.23 \
+		JT=1.1.24 \
 		MVER=${PORTVERSION} \
 		SI=2.0.1 \
 		SPRING=5.2.22 \
 		SPRINGS=5.1.13 \
-		VER1=27.1 \
+		VER1=28.0 \
 		VER3=1.1.3 \
 		WICKET=7.18.0
 
@@ -58,7 +58,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${STAGEDIR}${GEOSERVERDIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/start.jar ${STAGEDIR}${GEOSERVERDIR}/
 	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${GEOSERVERDIR}/
-	(cd ${WRKSRC} && ${INSTALL_DATA} NOTICE.md README.txt RUNNING.txt license/* \
+	(cd ${WRKSRC} && ${INSTALL_DATA} README.html RUNNING.html license/* \
 		VERSION.txt start.jar ${STAGEDIR}${GEOSERVERDIR})
 .for dir in ${GEODIRS}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${GEOSERVERDIR})
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 7c68a7950767..a8d060b36330 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659818032
-SHA256 (geoserver-2.21.1-bin.zip) = 2e7eef1d4fc9f3479d3896cbde501ecd7ae4fa3250da619663dfbad46ca22d79
-SIZE (geoserver-2.21.1-bin.zip) = 110599589
+TIMESTAMP = 1669556253
+SHA256 (geoserver-2.22.0-bin.zip) = ebcf88bdb3820634dd060e5d41bfb2769da7b6dd3b7ef5b09b800b73a9b568de
+SIZE (geoserver-2.22.0-bin.zip) = 116922248
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 23f510f1ed62..c85d5ed97657 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -1,11 +1,16 @@
-%%G%%/GPL.md
-%%G%%/LGPL.md
-%%G%%/NOTICE.md
-%%G%%/README.txt
-%%G%%/RUNNING.txt
+%%G%%/EPSG.html
+%%G%%/GEOTOOLS_NOTICE.html
+%%G%%/HSQL.html
+%%G%%/LGPL.html
+%%G%%/NOTICE.html
+%%G%%/NOTICE.txt
+%%G%%/OGC.html
+%%G%%/README.html
+%%G%%/RUNNING.html
 %%G%%/VERSION.txt
-%%G%%/apache-1.1.txt
-%%G%%/apache-2.0.txt
+%%G%%/W3C.html
+%%G%%/apache-1.1.html
+%%G%%/apache-2.0.html
 %%G%%/bin/shutdown.sh
 %%G%%/bin/startup.sh
 %%G%%/data_dir/README.rst
@@ -103,7 +108,7 @@
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shp
 %%G%%/data_dir/coverages/mosaic_sample/mosaic.shx
 %%G%%/data_dir/coverages/sfdem_sfdem/info.xml
-%%G%%/data_dir/csw.xml
+%%G%%/data_dir/data/ne/natural_earth.gpkg
 %%G%%/data_dir/data/nyc/giant_polygon.dbf
 %%G%%/data_dir/data/nyc/giant_polygon.prj
 %%G%%/data_dir/data/nyc/giant_polygon.qix
@@ -240,6 +245,7 @@
 %%G%%/data_dir/layergroups/spearfish.xml
 %%G%%/data_dir/layergroups/tasmania.xml
 %%G%%/data_dir/layergroups/tiger-ny.xml
+%%G%%/data_dir/layouts/style-editor-legend.xml
 %%G%%/data_dir/logging.xml
 %%G%%/data_dir/palettes/dem31.pal
 %%G%%/data_dir/palettes/ita31.pal
@@ -376,11 +382,39 @@
 %%G%%/data_dir/wcs.xml
 %%G%%/data_dir/wfs.xml
 %%G%%/data_dir/wms.xml
+%%G%%/data_dir/wmts.xml
 %%G%%/data_dir/workspaces/cite/namespace.xml
 %%G%%/data_dir/workspaces/cite/workspace.xml
 %%G%%/data_dir/workspaces/default.xml
 %%G%%/data_dir/workspaces/it.geosolutions/namespace.xml
 %%G%%/data_dir/workspaces/it.geosolutions/workspace.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/boundary_lines/featuretype.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/boundary_lines/layer.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/coastlines/featuretype.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/coastlines/layer.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/countries/featuretype.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/countries/layer.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/datastore.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/populated_places/featuretype.xml
+%%G%%/data_dir/workspaces/ne/GeoPackageSample/populated_places/layer.xml
+%%G%%/data_dir/workspaces/ne/layergroups/world.xml
+%%G%%/data_dir/workspaces/ne/namespace.xml
+%%G%%/data_dir/workspaces/ne/settings.xml
+%%G%%/data_dir/workspaces/ne/styles/boundary_lines.sld
+%%G%%/data_dir/workspaces/ne/styles/boundary_lines.xml
+%%G%%/data_dir/workspaces/ne/styles/coastline.sld
+%%G%%/data_dir/workspaces/ne/styles/coastline.xml
+%%G%%/data_dir/workspaces/ne/styles/countries.sld
+%%G%%/data_dir/workspaces/ne/styles/countries.xml
+%%G%%/data_dir/workspaces/ne/styles/countries_mapcolor9.sld
+%%G%%/data_dir/workspaces/ne/styles/countries_mapcolor9.xml
+%%G%%/data_dir/workspaces/ne/styles/populated_places.sld
+%%G%%/data_dir/workspaces/ne/styles/populated_places.xml
+%%G%%/data_dir/workspaces/ne/wcs.xml
+%%G%%/data_dir/workspaces/ne/wfs.xml
+%%G%%/data_dir/workspaces/ne/wms.xml
+%%G%%/data_dir/workspaces/ne/wmts.xml
+%%G%%/data_dir/workspaces/ne/workspace.xml
 %%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/coverage.xml
 %%G%%/data_dir/workspaces/nurc/arcGridSample/Arc_Sample/layer.xml
 %%G%%/data_dir/workspaces/nurc/arcGridSample/coveragestore.xml
@@ -500,22 +534,7 @@
 %%G%%/data_dir/www/styles/remoteOws.sld
 %%G%%/data_dir/www/styles/remoteTasmania.sld
 %%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
-@sample %%G%%/etc/jetty-jmx-platform.xml.sample
-@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%%/epl-1.0.html
 %%G%%/lib/ant-1.10.11.jar
 %%G%%/lib/ant-launcher-1.10.11.jar
 %%G%%/lib/commons-el-1.0.jar
@@ -535,7 +554,7 @@
 %%G%%/lib/jetty-webapp-%%JETTY%%.jar
 %%G%%/lib/jetty-xml-%%JETTY%%.jar
 %%G%%/lib/log4j-1.2-api-2.17.2.jar
-%%G%%/lib/log4j-1.2.14.jar
+%%G%%/lib/log4j-1.2.17.jar
 %%G%%/lib/log4j-api-2.17.2.jar
 %%G%%/lib/log4j-core-2.17.2.jar
 %%G%%/lib/log4j-jcl-2.17.2.jar
@@ -583,6 +602,8 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/batik-xml-%%BATIK%%.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/byte-buddy-1.11.13.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/byte-buddy-agent-1.11.13.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
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-codec-1.15.jar
@@ -590,26 +611,25 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-collections4-4.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-compiler-3.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-dbcp-1.4.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-fileupload-1.3.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/commons-httpclient-3.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/commons-fileupload-1.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/commons-io-2.8.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.8.1.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.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.34.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/ejml-ddense-0.34.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/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.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-gwc-rest-%%MVER%%.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
@@ -619,6 +639,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-restconfig-wcs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-restconfig-wfs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-restconfig-wms-%%MVER%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gs-restconfig-wmts-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-sec-jdbc-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-sec-ldap-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wcs-%%MVER%%.jar
@@ -646,6 +667,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-core-%%VER1%%.jar
 %%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-gml-geometry-streaming-%%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
@@ -662,7 +684,6 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gs-restconfig-wmts-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gt-tile-client-%%VER1%%.jar
@@ -712,7 +733,8 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/j2objc-annotations-1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jackson-annotations-2.13.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jackson-core-2.13.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-databind-2.13.2.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-databind-2.13.4.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jackson-dataformat-xml-2.13.2.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
@@ -724,7 +746,7 @@
 %%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.4.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jettison-1.5.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jgridshift-core-1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jna-%%JNA%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jna-platform-%%JNA%%.jar
@@ -775,7 +797,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.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jts-core-1.19.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
@@ -785,22 +807,24 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/log4j-slf4j-impl-2.17.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/marlin-0.9.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/mockito-core-3.12.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mxparser-1.2.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-%%VER1%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wmts-%%VER1%%.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/objenesis-3.2.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-%%VER1%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.2.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/oshi-core-6.2.2.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.3.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-42.4.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/re2j-1.6.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/serializer-2.7.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/si-quantity-%%SI%%.jar
@@ -823,18 +847,19 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-webmvc-%%SPRING%%.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/sqlite-jdbc-3.34.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/stax-ex-1.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/stax2-api-4.2.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
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-core-%%WICKET%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/wicket-datetime-%%WICKET%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-dnd-0.7.3.jar
 %%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/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.2.jar
 %%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
@@ -845,3 +870,18 @@
 %%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
+@sample %%G%%/etc/jetty-deploy.xml.sample
+@sample %%G%%/etc/jetty-http.xml.sample
+@sample %%G%%/etc/jetty-https.xml.sample
+@sample %%G%%/etc/jetty-jmx-platform.xml.sample
+@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