diff --git a/databases/neo4j/Makefile b/databases/neo4j/Makefile
index 501df41a209e..e83925443091 100644
--- a/databases/neo4j/Makefile
+++ b/databases/neo4j/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	neo4j
-DISTVERSION=	3.5.28
+DISTVERSION=	3.5.31
 CATEGORIES=	databases java
 MASTER_SITES=	http://dist.neo4j.org/
 DISTNAME=	${PORTNAME}-community-${DISTVERSION}-unix
 
 MAINTAINER=	jonathan@FreeBSD.org
 COMMENT=	High performance graph store and database
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,-unix,,}
 NO_BUILD=	yes
 USES=		cpe shebangfix
 SHEBANG_FILES=	bin/cypher-shell bin/neo4j-admin bin/neo4j-import
 USE_JAVA=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
 
 PLIST_SUB=	DBDIR=${DBDIR} DISTVERSION=${DISTVERSION}
 
 DBDIR=		${DESTDIR}/var/db/${PORTNAME}
 LOGDIR=		${DESTDIR}/var/log/${PORTNAME}
 RUNDIR=		${DESTDIR}/var/run/
 
 post-patch:
 	${REINPLACE_CMD} 's,%%DBDIR%%,${DBDIR},g;s,%%JAVA_HOME%%,${JAVA_HOME},g;s,%%LOGDIR%%,${LOGDIR},g;s,%%PREFIX%%,${PREFIX},g;s,%%RUNDIR%%,${RUNDIR},g' \
 		${WRKSRC}/bin/cypher-shell ${WRKSRC}/bin/neo4j* \
 		${WRKSRC}/conf/neo4j.conf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tools/* \
 		${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
 .for name in cypher-shell neo4j neo4j-admin neo4j-import
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${name} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/plugins
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/${PORTNAME}/lib
 .for f in ${PORTNAME}.conf
 	${INSTALL_DATA} ${WRKSRC}/conf/$f \
 		${STAGEDIR}${PREFIX}/etc/$f.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${DBDIR} ${STAGEDIR}${PREFIX}/etc/neo4j-certificates
 .include <bsd.port.mk>
diff --git a/databases/neo4j/distinfo b/databases/neo4j/distinfo
index dae11a8d7a9b..e5861533247a 100644
--- a/databases/neo4j/distinfo
+++ b/databases/neo4j/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627694914
-SHA256 (neo4j-community-3.5.28-unix.tar.gz) = d08415b80d4d6956ccd6063668b6d14d31905c41a712da1522b73079e7dc0aa1
-SIZE (neo4j-community-3.5.28-unix.tar.gz) = 138229560
+TIMESTAMP = 1646894527
+SHA256 (neo4j-community-3.5.31-unix.tar.gz) = 526138e44211e71b422bbc97cb895103c7e56520c8bed36b941e11d0c72e9e28
+SIZE (neo4j-community-3.5.31-unix.tar.gz) = 137766693
diff --git a/databases/neo4j/pkg-plist b/databases/neo4j/pkg-plist
index c7698be21711..8e96cbcb4c39 100644
--- a/databases/neo4j/pkg-plist
+++ b/databases/neo4j/pkg-plist
@@ -1,131 +1,133 @@
 bin/cypher-shell
 bin/neo4j
 bin/neo4j-admin
 bin/neo4j-import
 @sample etc/neo4j.conf.sample
 neo4j/lib/FastInfoset-1.2.16.jar
 neo4j/lib/WMI4Java-1.6.1.jar
 neo4j/lib/activation-1.1.1.jar
 neo4j/lib/bcpkix-jdk15on-1.68.jar
 neo4j/lib/bcprov-jdk15on-1.68.jar
-neo4j/lib/caffeine-2.6.2.jar
-neo4j/lib/commons-compress-1.19.jar
+neo4j/lib/caffeine-2.9.2.jar
+neo4j/lib/checker-qual-3.10.0.jar
+neo4j/lib/commons-compress-1.21.jar
 neo4j/lib/commons-configuration-1.10.jar
 neo4j/lib/commons-io-2.6.jar
 neo4j/lib/commons-lang-2.6.jar
 neo4j/lib/commons-lang3-3.8.jar
 neo4j/lib/commons-logging-1.1.1.jar
 neo4j/lib/commons-text-1.4.jar
 neo4j/lib/concurrentlinkedhashmap-lru-1.4.2.jar
 neo4j/lib/eclipse-collections-9.2.0.jar
 neo4j/lib/eclipse-collections-api-9.2.0.jar
+neo4j/lib/error_prone_annotations-2.5.1.jar
 neo4j/lib/istack-commons-runtime-3.0.8.jar
 neo4j/lib/jPowerShell-1.9.jar
 neo4j/lib/jProcesses-1.6.4.jar
 neo4j/lib/jackson-annotations-2.10.5.jar
 neo4j/lib/jackson-core-2.10.5.jar
 neo4j/lib/jackson-databind-2.10.5.1.jar
 neo4j/lib/jackson-jaxrs-base-2.10.5.jar
 neo4j/lib/jackson-jaxrs-json-provider-2.10.5.jar
 neo4j/lib/jackson-module-jaxb-annotations-2.10.5.jar
 neo4j/lib/jakarta.activation-api-1.2.1.jar
 neo4j/lib/jakarta.xml.bind-api-2.3.2.jar
 neo4j/lib/javax.servlet-api-3.1.0.jar
 neo4j/lib/jaxb-api-2.3.0.jar
 neo4j/lib/jaxb-runtime-2.3.2.jar
 neo4j/lib/jersey-core-1.19.3.jar
 neo4j/lib/jersey-server-1.19.3.jar
 neo4j/lib/jersey-servlet-1.19.3.jar
-neo4j/lib/jetty-http-9.4.39.v20210325.jar
-neo4j/lib/jetty-io-9.4.39.v20210325.jar
-neo4j/lib/jetty-security-9.4.39.v20210325.jar
-neo4j/lib/jetty-server-9.4.39.v20210325.jar
-neo4j/lib/jetty-servlet-9.4.39.v20210325.jar
-neo4j/lib/jetty-util-9.4.39.v20210325.jar
-neo4j/lib/jetty-webapp-9.4.39.v20210325.jar
-neo4j/lib/jetty-xml-9.4.39.v20210325.jar
-neo4j/lib/jsr311-api-1.1.2.r612.jar
+neo4j/lib/jetty-http-9.4.43.v20210629.jar
+neo4j/lib/jetty-io-9.4.43.v20210629.jar
+neo4j/lib/jetty-security-9.4.43.v20210629.jar
+neo4j/lib/jetty-server-9.4.43.v20210629.jar
+neo4j/lib/jetty-servlet-9.4.43.v20210629.jar
+neo4j/lib/jetty-util-9.4.43.v20210629.jar
+neo4j/lib/jetty-webapp-9.4.43.v20210629.jar
+neo4j/lib/jetty-xml-9.4.43.v20210629.jar
+neo4j/lib/jsr311-api-1.1.1.jar
 neo4j/lib/lucene-analyzers-common-5.5.5.jar
 neo4j/lib/lucene-codecs-5.5.5.jar
 neo4j/lib/lucene-core-5.5.5.jar
 neo4j/lib/lucene-queryparser-5.5.5.jar
 neo4j/lib/neo4j-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-annotation-processors-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-ast-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-bolt-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-browser-4.2.5.jar
+neo4j/lib/neo4j-browser-4.4.3.jar
 neo4j/lib/neo4j-codegen-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-collections-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-command-line-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-common-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-configuration-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-concurrent-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-consistency-check-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-csv-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-compiler-2.3-2.3.12.jar
 neo4j/lib/neo4j-cypher-compiler-3.1-3.1.9.jar
 neo4j/lib/neo4j-cypher-expression-3.4-3.4.18.jar
 neo4j/lib/neo4j-cypher-expression-evaluator-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-frontend-2.3-2.3.12.jar
 neo4j/lib/neo4j-cypher-frontend-3.1-3.1.9.jar
 neo4j/lib/neo4j-cypher-interpreted-runtime-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-ir-3.4-3.4.18.jar
 neo4j/lib/neo4j-cypher-ir-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-logical-plans-3.4-3.4.18.jar
 neo4j/lib/neo4j-cypher-logical-plans-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-planner-3.4-3.4.18.jar
 neo4j/lib/neo4j-cypher-planner-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-planner-spi-3.4-3.4.18.jar
 neo4j/lib/neo4j-cypher-planner-spi-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-runtime-util-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-util-3.4-3.4.18.jar
 neo4j/lib/neo4j-data-collector-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-diagnostics-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-dbms-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-expressions-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-front-end-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-fulltext-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-graph-algo-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-graph-matching-3.1.9.jar
 neo4j/lib/neo4j-graphdb-api-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-import-tool-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-io-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-jmx-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-kernel-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-kernel-api-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-legacy-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-logging-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-lucene-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-lucene-upgrade-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-parser-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-procedure-api-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-push-to-cloud-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-resource-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-rewriting-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-security-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-server-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-spatial-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-ssl-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-udc-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-unsafe-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-util-3.5-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-values-%%DISTVERSION%%.jar
-neo4j/lib/netty-all-4.1.48.Final.jar
+neo4j/lib/netty-all-4.1.68.Final.jar
 neo4j/lib/openCypher-frontend-1-3.4.18.jar
 neo4j/lib/opencsv-2.3.jar
 neo4j/lib/parboiled-core-1.1.7.jar
 neo4j/lib/parboiled-scala_2.11-1.1.7.jar
 neo4j/lib/scala-library-2.11.12.jar
 neo4j/lib/scala-reflect-2.11.12.jar
 neo4j/lib/server-api-%%DISTVERSION%%.jar
 neo4j/lib/stax-ex-1.8.1.jar
 neo4j/lib/txw2-2.3.2.jar
 neo4j/lib/zstd-jni-1.3.8-6.jar
 neo4j/lib/zstd-proxy-%%DISTVERSION%%.jar
 neo4j/libexec/tools/2.x-config-migrator.jar
 neo4j/libexec/tools/cypher-shell.jar
 @dir neo4j/lib/plugins
 @dir %%DBDIR%%
 @dir etc/neo4j-certificates