devel/opengrok: Upgrade to version 1.7.31

Upgrade opengrok to the latest upstream version to fix CVE-2021-2322,
which was actually fixed upstream in 1.6.7.

Convert the wrapper script from /bin/csh to /bin/sh.

Jave 11+ is required.

PR:		260534
MFH:		2022Q2
Security:	1135e939-62b4-11ec-b8e2-1c1b0d9ea7e6
(cherry picked from commit 065c811cfc470bd7495c11f895b7ae0bd2bb8dde)

6 files changed, 173 insertions, 255 deletions

diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 30ea7fb92641..d1d042ca76ff 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	opengrok
-PORTVERSION=	1.3.16
+PORTVERSION=	1.7.31
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/oracle/opengrok/releases/download/${PORTVERSION}/
 
@@ -8,6 +8,8 @@ COMMENT=	Fast and powerful code search and cross-reference engine
 
 LICENSE=	CDDL ADAIC BSD3CLAUSE EPL ECMA MIT RUBY
 LICENSE_COMB=	multi
+LICENSE_NAME_ADAIC=	Ada Reference Manual, ISO/IEC 8652:2007(E) Ed. 3
+LICENSE_NAME_ECMA=	Ecma International
 LICENSE_FILE_CDDL=	${WRKSRC}/doc/LICENSE.txt
 LICENSE_FILE_ADAIC=	${WRKSRC}/doc/LICENSE-adaic.org.txt
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/doc/LICENSE-scala.txt
@@ -15,9 +17,7 @@ LICENSE_FILE_EPL=	${WRKSRC}/doc/LICENSE-eclipse.txt
 LICENSE_FILE_ECMA=	${WRKSRC}/doc/LICENSE-ecma.txt
 LICENSE_FILE_MIT=	${WRKSRC}/doc/LICENSE-mandoc.txt
 LICENSE_FILE_RUBY=	${WRKSRC}/doc/LICENSE-ruby.txt
-LICENSE_NAME_ADAIC=	Ada Reference Manual, ISO/IEC 8652:2007(E) Ed. 3
 LICENSE_PERMS_ADAIC=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_NAME_ECMA=	Ecma International
 LICENSE_PERMS_ECMA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	uctags:devel/universal-ctags
@@ -25,109 +25,47 @@ RUN_DEPENDS=	uctags:devel/universal-ctags
 USES=		cpe
 CPE_VENDOR=	oracle
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	11+
 SHAREOWN=	www
 SHAREGRP=	www
 NO_BUILD=	yes
 NO_ARCH=	yes
-PORTDOCS=	README.md logging.properties.template paths.tsv
-SUB_FILES=	opengrok
-SUB_LIST+=	LIBFILES="${LIBFILES:S,^,${DATADIR}/lib/,}" \
-		JARFILE="${JARFILE}"
+PORTDOCS=	README.md logging.properties.template
+SUB_FILES=	opengrok pkg-message
+SUB_LIST+=	JARFILE="${JARFILE}"
 PLIST_SUB=	T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \
 		OWNER=${SHAREOWN} GROUP=${SHAREGRP}
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		AS
-OPTIONS_SINGLE_AS=	GLASSFISH TOMCAT85 TOMCAT9
-OPTIONS_DEFAULT=	TOMCAT85
+OPTIONS_SINGLE_AS=	GLASSFISH TOMCAT10
+OPTIONS_DEFAULT=	TOMCAT10
 
 GLASSFISH_DESC?=	Glassfish support
 
 GLASSFISH_VARS=	WEBAPP_HOME=${LOCALBASE}/glassfish-5.1.0/glassfish
-TOMCAT85_VARS=	WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.5
-TOMCAT9_VARS=	WEBAPP_HOME=${LOCALBASE}/apache-tomcat-9.0
+TOMCAT10_VARS=	WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.0
 
 GLASSFISH_BUILD_DEPENDS=${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish
 GLASSFISH_RUN_DEPENDS=	${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish
-TOMCAT85_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85
-TOMCAT85_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85
-TOMCAT9_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat9
-TOMCAT9_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat9
-
-JARFILE=	${DATADIR}/opengrok.jar
-LIBFILES=	activation-1.1.1.jar \
-		ant-1.10.1.jar \
-		ant-launcher-1.10.1.jar \
-		aopalliance-repackaged-2.6.1.jar \
-		bcel-6.4.1.jar \
-		classmate-1.3.4.jar \
-		commons-compress-1.19.jar \
-		commons-lang3-3.9.jar \
-		cron-utils-7.0.2.jar \
-		hibernate-validator-6.0.17.Final.jar \
-		hk2-api-2.6.1.jar \
-		hk2-locator-2.6.1.jar \
-		hk2-utils-2.6.1.jar \
-		jackson-annotations-2.10.1.jar \
-		jackson-core-2.10.1.jar \
-		jackson-databind-2.10.1.jar \
-		jackson-module-jaxb-annotations-2.10.1.jar \
-		jakarta.activation-api-1.2.1.jar \
-		jakarta.annotation-api-1.3.5.jar \
-		jakarta.el-3.0.2.jar \
-		jakarta.el-api-3.0.3.jar \
-		jakarta.inject-2.6.1.jar \
-		jakarta.validation-api-2.0.2.jar \
-		jakarta.ws.rs-api-2.1.6.jar \
-		jakarta.xml.bind-api-2.3.2.jar \
-		javassist-3.25.0-GA.jar \
-		jaxb-api-2.3.0.jar \
-		jaxb-core-2.3.0.jar \
-		jaxb-impl-2.3.0.jar \
-		jboss-logging-3.3.2.Final.jar \
-		jersey-bean-validation-2.30.1.jar \
-		jersey-client-2.30.1.jar \
-		jersey-common-2.30.1.jar \
-		jersey-entity-filtering-2.30.1.jar \
-		jersey-hk2-2.30.1.jar \
-		jersey-media-jaxb-2.30.1.jar \
-		jersey-media-json-jackson-2.30.1.jar \
-		jersey-server-2.30.1.jar \
-		lucene-analyzers-common-8.5.2.jar \
-		lucene-backward-codecs-8.5.2.jar \
-		lucene-core-8.5.2.jar \
-		lucene-highlighter-8.5.2.jar \
-		lucene-join-8.5.2.jar \
-		lucene-memory-8.5.2.jar \
-		lucene-queries-8.5.2.jar \
-		lucene-queryparser-8.5.2.jar \
-		lucene-sandbox-8.5.2.jar \
-		lucene-suggest-8.5.2.jar \
-		opengrok-1.3.16.jar \
-		org.suigeneris.jrcs.diff-0.4.2.jar \
-		org.suigeneris.jrcs.rcs-0.4.2.jar \
-		osgi-resource-locator-1.0.3.jar \
-		slf4j-api-1.7.12.jar
+TOMCAT10_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat10
+TOMCAT10_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat10
 
 WEBAPPS_DIR=	${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps
+JARFILE=	${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${PORTVERSION}.jar
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/lib/opengrok
 	@${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/etc ${STAGEDIR}${DATADIR}/lib \
+	@${MKDIR} ${STAGEDIR}${DATADIR}/etc \
 		${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME} \
 		${STAGEDIR}/var/log/opengrok
 	(cd ${WRKSRC}/lib/opengrok && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME})
 	(cd ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF && \
 		${MV} web.xml web.xml.sample)
-	${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} \
-		${STAGEDIR}${DATADIR}/lib/
-	${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${STAGEDIR}${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/lib/source.war ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/logging.properties ${STAGEDIR}${DATADIR}/etc/logging.properties.sample
 	${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin
 
diff --git a/devel/opengrok/distinfo b/devel/opengrok/distinfo
index 9236162f4957..917a409bbfec 100644
--- a/devel/opengrok/distinfo
+++ b/devel/opengrok/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597089207
-SHA256 (opengrok-1.3.16.tar.gz) = 72496b9d2d731a618507c41d8339282c72d9083d6f36477a4e412a22c7091a7f
-SIZE (opengrok-1.3.16.tar.gz) = 55244095
+TIMESTAMP = 1650873302
+SHA256 (opengrok-1.7.31.tar.gz) = dba38e9cf08a3a53bff12d8f5491959e60fedfc2fc3374c335ce352a0b139ae9
+SIZE (opengrok-1.7.31.tar.gz) = 77733534
diff --git a/devel/opengrok/files/opengrok.in b/devel/opengrok/files/opengrok.in
index 419ee35b2c97..19c2360ac275 100644
--- a/devel/opengrok/files/opengrok.in
+++ b/devel/opengrok/files/opengrok.in
@@ -1,13 +1,6 @@
-#!/bin/csh
+#!/bin/sh
 
-set JAVA = "%%LOCALBASE%%/bin/java"
-set LIBFILES = "%%LIBFILES%%"
-setenv JAVA_VERSION "%%JAVA_VERSION%%"
+JAVA= "%%LOCALBASE%%/bin/java"
+export JAVA_VERSION="%%JAVA_VERSION%%"
 
-if ( "${LIBFILES}" != "" ) then
-	set CLASSPATH = `echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'`
-else
-	set CLASSPATH = ""
-endif
-
-exec "${JAVA}" -cp "${CLASSPATH}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/exctags -w opengrok $*
+exec "${JAVA}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/uctags $*
diff --git a/devel/opengrok/files/pkg-message.in b/devel/opengrok/files/pkg-message.in
new file mode 100644
index 000000000000..5e86c127bab9
--- /dev/null
+++ b/devel/opengrok/files/pkg-message.in
@@ -0,0 +1,18 @@
+[
+{ type: install
+  message: <<EOM
+java version 11 or higher is required.  Example:
+	tomcat10_java_home="%%LOCALBASE%%/openjdk11" in /etc/rc.conf
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+It is necessary to reindex from scratch when upgrading from anything
+older than opengrok 1.4.1, and is recommended when upgrading from
+anything older than opengrok 1.7.25.
+
+java version 11 or higher is required.  Example:
+	tomcat10_java_home="%%LOCALBASE%%/openjdk11" in /etc/rc.conf
+EOM
+}
+]
diff --git a/devel/opengrok/pkg-message b/devel/opengrok/pkg-message
deleted file mode 100644
index 4de2c3f35f0f..000000000000
--- a/devel/opengrok/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: upgrade
-  message: <<EOM
-	It is necessary to reindex from scratch when upgrading from
-	anything older than opengrok 1.3.0.
-EOM
-}
-]
diff --git a/devel/opengrok/pkg-plist b/devel/opengrok/pkg-plist
index 3b889f4db042..e7d2bfa96e8d 100644
--- a/devel/opengrok/pkg-plist
+++ b/devel/opengrok/pkg-plist
@@ -1,60 +1,5 @@
 bin/opengrok
 @sample %%DATADIR%%/etc/logging.properties.sample
-%%DATADIR%%/lib/activation-1.1.1.jar
-%%DATADIR%%/lib/ant-1.10.1.jar
-%%DATADIR%%/lib/ant-launcher-1.10.1.jar
-%%DATADIR%%/lib/aopalliance-repackaged-2.6.1.jar
-%%DATADIR%%/lib/bcel-6.4.1.jar
-%%DATADIR%%/lib/classmate-1.3.4.jar
-%%DATADIR%%/lib/commons-compress-1.19.jar
-%%DATADIR%%/lib/commons-lang3-3.9.jar
-%%DATADIR%%/lib/cron-utils-7.0.2.jar
-%%DATADIR%%/lib/hibernate-validator-6.0.17.Final.jar
-%%DATADIR%%/lib/hk2-api-2.6.1.jar
-%%DATADIR%%/lib/hk2-locator-2.6.1.jar
-%%DATADIR%%/lib/hk2-utils-2.6.1.jar
-%%DATADIR%%/lib/jackson-annotations-2.10.1.jar
-%%DATADIR%%/lib/jackson-core-2.10.1.jar
-%%DATADIR%%/lib/jackson-databind-2.10.1.jar
-%%DATADIR%%/lib/jackson-module-jaxb-annotations-2.10.1.jar
-%%DATADIR%%/lib/jakarta.activation-api-1.2.1.jar
-%%DATADIR%%/lib/jakarta.annotation-api-1.3.5.jar
-%%DATADIR%%/lib/jakarta.el-3.0.2.jar
-%%DATADIR%%/lib/jakarta.el-api-3.0.3.jar
-%%DATADIR%%/lib/jakarta.inject-2.6.1.jar
-%%DATADIR%%/lib/jakarta.validation-api-2.0.2.jar
-%%DATADIR%%/lib/jakarta.ws.rs-api-2.1.6.jar
-%%DATADIR%%/lib/jakarta.xml.bind-api-2.3.2.jar
-%%DATADIR%%/lib/javassist-3.25.0-GA.jar
-%%DATADIR%%/lib/jaxb-api-2.3.0.jar
-%%DATADIR%%/lib/jaxb-core-2.3.0.jar
-%%DATADIR%%/lib/jaxb-impl-2.3.0.jar
-%%DATADIR%%/lib/jboss-logging-3.3.2.Final.jar
-%%DATADIR%%/lib/jersey-bean-validation-2.30.1.jar
-%%DATADIR%%/lib/jersey-client-2.30.1.jar
-%%DATADIR%%/lib/jersey-common-2.30.1.jar
-%%DATADIR%%/lib/jersey-entity-filtering-2.30.1.jar
-%%DATADIR%%/lib/jersey-hk2-2.30.1.jar
-%%DATADIR%%/lib/jersey-media-jaxb-2.30.1.jar
-%%DATADIR%%/lib/jersey-media-json-jackson-2.30.1.jar
-%%DATADIR%%/lib/jersey-server-2.30.1.jar
-%%DATADIR%%/lib/lucene-analyzers-common-8.5.2.jar
-%%DATADIR%%/lib/lucene-backward-codecs-8.5.2.jar
-%%DATADIR%%/lib/lucene-core-8.5.2.jar
-%%DATADIR%%/lib/lucene-highlighter-8.5.2.jar
-%%DATADIR%%/lib/lucene-join-8.5.2.jar
-%%DATADIR%%/lib/lucene-memory-8.5.2.jar
-%%DATADIR%%/lib/lucene-queries-8.5.2.jar
-%%DATADIR%%/lib/lucene-queryparser-8.5.2.jar
-%%DATADIR%%/lib/lucene-sandbox-8.5.2.jar
-%%DATADIR%%/lib/lucene-suggest-8.5.2.jar
-%%DATADIR%%/lib/opengrok-1.3.16.jar
-%%DATADIR%%/lib/org.suigeneris.jrcs.diff-0.4.2.jar
-%%DATADIR%%/lib/org.suigeneris.jrcs.rcs-0.4.2.jar
-%%DATADIR%%/lib/osgi-resource-locator-1.0.3.jar
-%%DATADIR%%/lib/slf4j-api-1.7.12.jar
-%%DATADIR%%/opengrok.jar
-%%DATADIR%%/source.war
 @group %%OWNER%%
 @owner %%GROUP%%
 @dir /var/log/opengrok
@@ -63,11 +8,23 @@ bin/opengrok
 %%T%%/webapps/opengrok/META-INF/maven/org.opengrok/opengrok-web/pom.properties
 %%T%%/webapps/opengrok/META-INF/maven/org.opengrok/opengrok-web/pom.xml
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/AuthorizationFilter.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/CookieFilter.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/DiffData.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/DiffType.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/DirectoryListing.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/GetFile.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/PageConfig.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/ProjectHelper.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/ResponseHeaderFilter.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/Scripts$FileScript.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/Scripts$Script.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/Scripts$Type.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/Scripts.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/StatisticsFilter.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/WebappListener.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/ApiTask$ApiTaskState.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/ApiTask.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/ApiTaskManager.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/error/ExceptionMapperUtils$ExceptionModel.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/error/ExceptionMapperUtils.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/error/GenericExceptionMapper.class
@@ -86,19 +43,18 @@ bin/opengrok
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/MessagesController.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/ProjectsController.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/RepositoriesController.class
-%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SearchController$1.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SearchController$SearchEngineWrapper.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SearchController$SearchHit.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SearchController$SearchResult.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SearchController.class
-%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/StatsController.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/StatusController.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SuggesterController$Result.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SuggesterController$TermIncrementData.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SuggesterController.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/controller/SystemController.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/filter/CorsEnable.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/filter/CorsFilter.class
-%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/filter/LocalhostFilter.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/filter/IncomingFilter.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/filter/PathAuthorizationFilter.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/filter/PathAuthorized.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/suggester/SuggesterAppBinder.class
@@ -116,110 +72,132 @@ bin/opengrok
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/suggester/query/SuggesterQueryBuilder.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/api/v1/suggester/query/SuggesterQueryParser.class
+%%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/servlet/MetricsServlet.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/util/DTOUtil.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/util/FileUtil.class
 %%T%%/webapps/opengrok/WEB-INF/classes/org/opengrok/web/util/NoPathParameterException.class
-%%T%%/webapps/opengrok/WEB-INF/lib/activation-1.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/affinity-3.1.11.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/annotations-12.0.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/ant-1.10.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/ant-launcher-1.10.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/aopalliance-repackaged-2.6.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/asm-5.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/bcel-6.4.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/cglib-3.2.4.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-algorithms-1.16.0.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-bytes-2.17.31.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-core-2.17.14.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-map-3.17.4.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-threads-2.17.4.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-values-2.16.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-wire-2.17.40.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/classmate-1.3.4.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/commons-compress-1.19.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/commons-io-2.6.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/commons-lang3-3.9.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/compiler-2.3.4.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/cron-utils-7.0.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/hibernate-validator-6.0.17.Final.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/hk2-api-2.6.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/hk2-locator-2.6.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/hk2-utils-2.6.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jackson-annotations-2.10.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jackson-core-2.10.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jackson-databind-2.10.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jackson-module-jaxb-annotations-2.10.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.activation-api-1.2.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-3.0.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-api-3.0.3.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.inject-2.6.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.validation-api-2.0.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.ws.rs-api-2.1.6.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.xml.bind-api-2.3.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/javapoet-1.5.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/HdrHistogram-2.1.12.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/JavaEWAH-1.1.7.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/LatencyUtils-2.0.3.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/affinity-3.21ea5.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/ant-1.10.11.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/ant-launcher-1.10.11.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/aopalliance-repackaged-3.0.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/asm-7.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/backport-util-concurrent-3.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/bcel-6.5.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/cglib-3.3.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-algorithms-2.21.82.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-analytics-2.21ea0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-bytes-2.21.89.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-core-2.21.91.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-map-3.21.85.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-threads-2.21.85.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-values-2.21.82.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/chronicle-wire-2.21.89.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/classgraph-4.8.106.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/classmate-1.5.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/commons-compress-1.21.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/commons-io-2.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/commons-lang3-3.12.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/compiler-2.21ea1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/cron-utils-9.1.6.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/hibernate-validator-7.0.0.Final.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/hk2-api-3.0.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/hk2-locator-3.0.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/hk2-utils-3.0.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/istack-commons-runtime-4.0.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jackson-annotations-2.12.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jackson-core-2.12.3.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jackson-databind-2.12.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jackson-module-jaxb-annotations-2.12.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.activation-2.0.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.activation-api-2.0.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.annotation-api-2.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-4.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.el-api-4.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.inject-api-2.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.servlet.jsp.jstl-2.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.servlet.jsp.jstl-api-2.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.validation-api-3.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.ws.rs-api-3.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jakarta.xml.bind-api-3.0.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/javapoet-1.13.0.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/javassist-3.25.0-GA.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jaxb-api-2.3.0.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jaxb-core-2.3.0.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jaxb-impl-2.3.0.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jboss-logging-3.3.2.Final.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jcl-over-slf4j-1.6.6.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-bean-validation-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-client-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-common-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-core-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-entity-filtering-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-hk2-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-media-jaxb-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-media-json-jackson-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jersey-server-2.30.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jettison-1.3.8.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jna-4.2.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jna-platform-4.2.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jsp-api-2.0.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/jstl-1.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-analyzers-common-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-backward-codecs-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-highlighter-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-join-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-memory-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-queries-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-queryparser-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-sandbox-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-suggest-8.5.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/modelmapper-2.3.0.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/opengrok-1.3.16.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/javax.activation-api-1.2.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jaxb-api-2.3.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jaxb-core-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jaxb-runtime-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jboss-logging-3.4.1.Final.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-bean-validation-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-client-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-common-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-container-servlet-core-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-entity-filtering-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-hk2-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-media-json-jackson-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jersey-server-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jettison-1.4.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jna-5.5.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jna-platform-5.5.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jquery-3.6.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-analyzers-common-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-backward-codecs-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-highlighter-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-join-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-memory-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-queries-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-queryparser-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-sandbox-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-suggest-8.11.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/micrometer-core-1.8.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/micrometer-registry-prometheus-1.8.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/micrometer-registry-statsd-1.8.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/modelmapper-2.4.4.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/mxparser-1.2.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/opengrok-1.7.31.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/org.eclipse.jgit-5.12.0.202106070339-r.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/org.suigeneris.jrcs.diff-0.4.2.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/org.suigeneris.jrcs.rcs-0.4.2.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/osgi-resource-locator-1.0.3.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/pax-url-aether-2.4.5.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/servlet-api-2.4.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/slf4j-api-1.7.12.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/slf4j-nop-1.7.25.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/stax-api-1.0.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/suggester-1.3.16.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/showdown-1.9.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/simpleclient-0.12.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/simpleclient_common-0.12.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/simpleclient_tracer_common-0.12.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/simpleclient_tracer_otel-0.12.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/simpleclient_tracer_otel_agent-0.12.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/slf4j-api-1.7.30.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/slf4j-nop-1.7.30.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/suggester-1.7.31.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/tablesorter-2.31.3.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/txw2-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/versioncompare-1.5.0.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/webjars-locator-core-0.47.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/xmlpull-1.1.3.1.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/xpp3_min-1.1.4c.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/xstream-1.4.9.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/xss-1.0.8.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/xstream-1.4.19.jar
 %%T%%/webapps/opengrok/WEB-INF/tags/project.tag
 %%T%%/webapps/opengrok/WEB-INF/tags/projects.tag
 %%T%%/webapps/opengrok/WEB-INF/tags/repositories.tag
 %%T%%/webapps/opengrok/WEB-INF/tags/repository.tag
 @sample %%T%%/webapps/opengrok/WEB-INF/web.xml.sample
+%%T%%/webapps/opengrok/default/font/SunSansRegular.woff2
 %%T%%/webapps/opengrok/default/img/Logo.png
+%%T%%/webapps/opengrok/default/img/apple-touch-icon.png
 %%T%%/webapps/opengrok/default/img/bg.png
 %%T%%/webapps/opengrok/default/img/button1.png
 %%T%%/webapps/opengrok/default/img/button2.png
 %%T%%/webapps/opengrok/default/img/button3.png
-%%T%%/webapps/opengrok/default/img/combined.png
 %%T%%/webapps/opengrok/default/img/diff-jumper.png
 %%T%%/webapps/opengrok/default/img/diff-jumping.png
+%%T%%/webapps/opengrok/default/img/favicon.svg
 %%T%%/webapps/opengrok/default/img/folding.png
-%%T%%/webapps/opengrok/default/img/icon.png
+%%T%%/webapps/opengrok/default/img/google-touch-icon.png
 %%T%%/webapps/opengrok/default/img/indicator.gif
 %%T%%/webapps/opengrok/default/img/intelli-window.png
+%%T%%/webapps/opengrok/default/img/mask-icon.svg
 %%T%%/webapps/opengrok/default/img/rss.png
 %%T%%/webapps/opengrok/default/img/servedby.png
 %%T%%/webapps/opengrok/default/img/symbol-highlighting.png
@@ -238,12 +216,12 @@ bin/opengrok
 %%T%%/webapps/opengrok/default/jquery.tooltip.min.css
 %%T%%/webapps/opengrok/default/mandoc-1.0.0.css
 %%T%%/webapps/opengrok/default/mandoc-1.0.0.min.css
-%%T%%/webapps/opengrok/default/print-1.0.0.css
-%%T%%/webapps/opengrok/default/print-1.0.0.min.css
+%%T%%/webapps/opengrok/default/print-1.0.2.css
+%%T%%/webapps/opengrok/default/print-1.0.2.min.css
 %%T%%/webapps/opengrok/default/searchable-option-list-2.0.3.css
 %%T%%/webapps/opengrok/default/searchable-option-list-2.0.3.min.css
-%%T%%/webapps/opengrok/default/style-1.0.0.css
-%%T%%/webapps/opengrok/default/style-1.0.0.min.css
+%%T%%/webapps/opengrok/default/style-1.0.4.css
+%%T%%/webapps/opengrok/default/style-1.0.4.min.css
 %%T%%/webapps/opengrok/diff.jsp
 %%T%%/webapps/opengrok/eforbidden.jsp
 %%T%%/webapps/opengrok/enoent.jsp
@@ -253,24 +231,21 @@ bin/opengrok
 %%T%%/webapps/opengrok/history.jsp
 %%T%%/webapps/opengrok/httpheader.jspf
 %%T%%/webapps/opengrok/index.jsp
-%%T%%/webapps/opengrok/js/diff-0.0.4.js
-%%T%%/webapps/opengrok/js/diff-0.0.4.min.js
-%%T%%/webapps/opengrok/js/jquery-3.4.1.min.js
-%%T%%/webapps/opengrok/js/jquery-tablesorter-2.26.6.min.js
+%%T%%/webapps/opengrok/js/diff-0.0.5.js
+%%T%%/webapps/opengrok/js/diff-0.0.5.min.js
 %%T%%/webapps/opengrok/js/jquery-ui-1.12.1-custom.min.js
 %%T%%/webapps/opengrok/js/jquery-ui-1.12.1-draggable.min.js
 %%T%%/webapps/opengrok/js/jquery.caret-1.5.2.min.js
-%%T%%/webapps/opengrok/js/repos-0.0.2.js
-%%T%%/webapps/opengrok/js/repos-0.0.2.min.js
-%%T%%/webapps/opengrok/js/searchable-option-list-2.0.12.js
-%%T%%/webapps/opengrok/js/searchable-option-list-2.0.12.min.js
-%%T%%/webapps/opengrok/js/showdown-1.8.4.min.js
-%%T%%/webapps/opengrok/js/tablesorter-parsers-0.0.2.js
-%%T%%/webapps/opengrok/js/tablesorter-parsers-0.0.2.min.js
-%%T%%/webapps/opengrok/js/utils-0.0.34.js
-%%T%%/webapps/opengrok/js/utils-0.0.34.min.js
-%%T%%/webapps/opengrok/js/xss-0.2.16.min.js
+%%T%%/webapps/opengrok/js/repos-0.0.3.js
+%%T%%/webapps/opengrok/js/repos-0.0.3.min.js
+%%T%%/webapps/opengrok/js/searchable-option-list-2.0.15.js
+%%T%%/webapps/opengrok/js/searchable-option-list-2.0.15.min.js
+%%T%%/webapps/opengrok/js/tablesorter-parsers-0.0.3.js
+%%T%%/webapps/opengrok/js/tablesorter-parsers-0.0.3.min.js
+%%T%%/webapps/opengrok/js/utils-0.0.45.js
+%%T%%/webapps/opengrok/js/utils-0.0.45.min.js
 %%T%%/webapps/opengrok/list.jsp
+%%T%%/webapps/opengrok/manifest.json
 %%T%%/webapps/opengrok/mast.jsp
 %%T%%/webapps/opengrok/menu.jspf
 %%T%%/webapps/opengrok/minisearch.jspf
@@ -282,6 +257,8 @@ bin/opengrok
 %%T%%/webapps/opengrok/rss.jsp
 %%T%%/webapps/opengrok/rss.xsl.xml
 %%T%%/webapps/opengrok/search.jsp
+%%T%%/webapps/opengrok/settings.jsp
 %%T%%/webapps/opengrok/status.jsp
+%%T%%/webapps/opengrok/xref.jspf
 @group
 @owner