diff --git a/devel/sonarqube-community/Makefile b/devel/sonarqube-community/Makefile
index 2b3b854e996e..916ccd6c7069 100644
--- a/devel/sonarqube-community/Makefile
+++ b/devel/sonarqube-community/Makefile
@@ -1,166 +1,166 @@
 # $FreeBSD$
 
 PORTNAME=	sonarqube
 DISTVERSION=	8.7.0.41497
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel security www java
 MASTER_SITES=	https://binaries.sonarsource.com/Distribution/sonarqube/:m_core \
 		https://binaries.sonarsource.com/Distribution/sonar-csharp-plugin/:m_csharp \
 		https://binaries.sonarsource.com/Distribution/sonar-java-plugin/:m_java \
 		https://binaries.sonarsource.com/Distribution/sonar-javascript-plugin/:m_javascript \
 		https://binaries.sonarsource.com/Distribution/sonar-php-plugin/:m_php \
 		https://binaries.sonarsource.com/Distribution/sonar-python-plugin/:m_python \
 		https://binaries.sonarsource.com/Distribution/sonar-vbnet-plugin/:m_vbnet
 PKGNAMESUFFIX=	-community
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:m_core \
 		sonar-csharp-plugin-${SONARCSHARP_VER}.jar:m_csharp \
 		sonar-java-plugin-${SONARJAVA_VER}.jar:m_java \
 		sonar-javascript-plugin-${SONARJAVASCRIPT_VER}.jar:m_javascript \
 		sonar-php-plugin-${SONARPHP_VER}.jar:m_php \
 		sonar-python-plugin-${SONARPYTHON_VER}.jar:m_python \
 		sonar-vbnet-plugin-${SONARVBNET_VER}.jar:m_vbnet
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Web-based continuous code inspection tool
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash:shells/bash \
 		jna>0:devel/jna
 
 USES=		shebangfix zip
 CPE_VENDOR=	sonarsource
 USE_JAVA=	yes
 
 SHEBANG_FILES=	elasticsearch/bin/elasticsearch \
 		elasticsearch/bin/elasticsearch-env
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	11+
 JAVA_VENDOR=	openjdk
 USE_RC_SUBR=	${PORTNAME}
 
 APP_NAME=	${PORTNAME}
 APP_DIR=	libexec/${PORTNAME}
 LOG_DIR=	/var/log/${PORTNAME}
 PID_DIR=	/var/run/${PORTNAME}
 JAR_VERSION=	${DISTVERSION}
 DBBASE_DIR=	/var/db/${PORTNAME}
 DATA_DIR=	${DBBASE_DIR}/data
 TEMP_DIR=	${DBBASE_DIR}/temp
 
-SONARCSHARP_VER=	8.17.0.26580
-SONARJAVA_VER=		6.12.0.24852
-SONARJAVASCRIPT_VER=	7.2.0.14938
+SONARCSHARP_VER=	8.18.0.27296
+SONARJAVA_VER=		6.13.0.25138
+SONARJAVASCRIPT_VER=	7.2.1.14998
 SONARPHP_VER=		3.15.0.7197
 SONARPYTHON_VER=	3.2.0.7856
-SONARVBNET_VER=		8.17.0.26580
+SONARVBNET_VER=		${SONARCSHARP_VER}
 
 USERS=		sonarqube
 GROUPS=		sonarqube
 
 SUB_LIST=	\
 		APP_NAME=${APP_NAME} \
 		APP_DIR=${APP_DIR} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVA=${JAVA} \
 		LOG_DIR=${LOG_DIR} \
 		PID_DIR=${PID_DIR} \
 		JAR_VERSION=${JAR_VERSION} \
 		DATA_DIR=${DATA_DIR} \
 		TEMP_DIR=${TEMP_DIR}
 
 SUB_FILES=	\
 		${APP_NAME} \
 		pkg-message
 
 PLIST_SUB=	APP_NAME=${APP_NAME} \
 		APP_DIR=${APP_DIR} \
 		LOG_DIR=${LOG_DIR} \
 		PID_DIR=${PID_DIR} \
 		JAR_VERSION=${JAR_VERSION} \
 		DBBASE_DIR=${DBBASE_DIR} \
 		DATA_DIR=${DATA_DIR} \
 		TEMP_DIR=${TEMP_DIR} \
 		SONARCSHARP_VER=${SONARCSHARP_VER} \
 		SONARJAVA_VER=${SONARJAVA_VER} \
 		SONARJAVASCRIPT_VER=${SONARJAVASCRIPT_VER} \
 		SONARPHP_VER=${SONARPHP_VER} \
 		SONARPYTHON_VER=${SONARPYTHON_VER} \
 		SONARSCMGIT_VER=${SONARSCMGIT_VER} \
 		SONARSCMSVN_VER=${SONARSCMSVN_VER} \
 		SONARVBNET_VER=${SONARVBNET_VER}
 
 post-extract:
 	${RM} -r ${WRKSRC}/bin ${WRKSRC}/lib/jsw ${WRKSRC}/conf/wrapper.conf
 	${RM} ${WRKSRC}/elasticsearch/lib/jna*.jar
 	${MV} ${WRKSRC}/conf/sonar.properties ${WRKSRC}/conf/sonar.properties.sample
 .for plugin in sonar-csharp-plugin \
     sonar-java-plugin \
     sonar-javascript-plugin \
     sonar-php-plugin \
     sonar-python-plugin \
     sonar-vbnet-plugin
 	${RM} ${WRKSRC}/lib/extensions/${plugin}-*.jar
 .endfor
 .for plugin in sonar-csharp-plugin-${SONARCSHARP_VER}.jar \
     sonar-java-plugin-${SONARJAVA_VER}.jar \
     sonar-javascript-plugin-${SONARJAVASCRIPT_VER}.jar \
     sonar-php-plugin-${SONARPHP_VER}.jar \
     sonar-python-plugin-${SONARPYTHON_VER}.jar \
     sonar-vbnet-plugin-${SONARVBNET_VER}.jar
 	${CP} ${DISTDIR}/${plugin} ${WRKSRC}/lib/extensions/
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} -e 's:%%LOG_DIR%%:${LOG_DIR}:g ; s:%%DATA_DIR%%:${DATA_DIR}:g ; s:%%TEMP_DIR%%:${TEMP_DIR}:g' ${WRKSRC}/conf/sonar.properties.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APP_DIR}/elasticsearch/plugins
 	${MKDIR} ${STAGEDIR}${LOG_DIR} ${STAGEDIR}${PID_DIR} \
 		${STAGEDIR}${DATA_DIR} ${STAGEDIR}${TEMP_DIR}
 .for dir in conf elasticsearch extensions lib web
 	cd ${WRKSRC}; ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/${APP_DIR} "! -name *\.orig"
 .endfor
 	 ${LN} -s ${JAVASHAREDIR}/classes/jna.jar \
 		${STAGEDIR}${PREFIX}/${APP_DIR}/elasticsearch/lib/jna.jar
 
 gen-plist:
 	${ECHO} '@sample ${APP_DIR}/conf/sonar.properties.sample' >${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%DBBASE_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%DATA_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%TEMP_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir %%APP_DIR%%/elasticsearch/plugins' >>${PLIST}.new
 #	${ECHO} '@dir(sonarqube,sonarqube,755) %%APP_DIR%%/extensions' >>${PLIST}.new
 .for dir in conf elasticsearch lib web
 	${FIND} ${STAGEDIR}${PREFIX}/${APP_DIR}/${dir} -type f -o -type l |  \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; \
 		s:${JAR_VERSION}:%%JAR_VERSION%%:g ; \
 		s:sonar-csharp-plugin-[0-9.]*.jar:sonar-csharp-plugin-%%SONARCSHARP_VER%%.jar:g ; \
 		s:sonar-java-plugin-[0-9.]*.jar:sonar-java-plugin-%%SONARJAVA_VER%%.jar:g ; \
 		s:sonar-javascript-plugin-[0-9.]*.jar:sonar-javascript-plugin-%%SONARJAVASCRIPT_VER%%.jar:g ; \
 		s:sonar-php-plugin-[0-9.]*.jar:sonar-php-plugin-%%SONARPHP_VER%%.jar:g ; \
 		s:sonar-python-plugin-[0-9.]*.jar:sonar-python-plugin-%%SONARPYTHON_VER%%.jar:g ; \
 		s:sonar-vbnet-plugin-[0-9.]*.jar:sonar-vbnet-plugin-%%SONARVBNET_VER%%.jar:g ; \
 		s:\(.*elasticsearch/bin.*\):@(,,755) \1:g" | \
 	    ${GREP} -v conf/sonar.properties.sample | ${SORT} >> ${PLIST}.new
 .endfor
 	${ECHO} '@owner sonarqube' >>${PLIST}.new
 	${ECHO} '@group sonarqube' >>${PLIST}.new
 .for dir in extensions
 	${FIND} ${STAGEDIR}${PREFIX}/${APP_DIR}/${dir} -type d | \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/:@dir(sonarqube,sonarqube,755) :g" | \
 	    ${SORT} >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/${APP_DIR}/${dir} -type f | \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; \
 		s:${JAR_VERSION}:%%JAR_VERSION%%:g" | \
 	    ${SORT} >> ${PLIST}.new
 .endfor
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%LOG_DIR%%' >> ${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%PID_DIR%%' >> ${PLIST}.new
 
 .include <bsd.port.mk>
diff --git a/devel/sonarqube-community/distinfo b/devel/sonarqube-community/distinfo
index 3d731490c8b1..ee428d6d82ee 100644
--- a/devel/sonarqube-community/distinfo
+++ b/devel/sonarqube-community/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1613632862
+TIMESTAMP = 1614328959
 SHA256 (sonarqube-8.7.0.41497.zip) = 69d7036a881d7af5b5cac61db7b2b60af1f27d4694fcffbd9899f091c7ba4261
 SIZE (sonarqube-8.7.0.41497.zip) = 255910597
-SHA256 (sonar-csharp-plugin-8.17.0.26580.jar) = 371906d9e6f5ea1343be189d6411bcee6cb4760677337f52bf9766efe74a6c02
-SIZE (sonar-csharp-plugin-8.17.0.26580.jar) = 5082480
-SHA256 (sonar-java-plugin-6.12.0.24852.jar) = e1928d70e195305e82722efb4dcbc1d7b345b0c2b14ae0293e1e9b6ec46bcecc
-SIZE (sonar-java-plugin-6.12.0.24852.jar) = 17461151
-SHA256 (sonar-javascript-plugin-7.2.0.14938.jar) = c4d1f1f86abeffa109d5ef0cce4acb7ed0cc4f5e0a42655b254b6fed4e73b09d
-SIZE (sonar-javascript-plugin-7.2.0.14938.jar) = 20158411
+SHA256 (sonar-csharp-plugin-8.18.0.27296.jar) = 581e7625b0a5d1a7ad6f9f1a57fcd576cd27e3a470fbd83b250a5726e1b80506
+SIZE (sonar-csharp-plugin-8.18.0.27296.jar) = 5088627
+SHA256 (sonar-java-plugin-6.13.0.25138.jar) = 9ceed57570f0c3958ad2510da316d73823f9bc3fce77b1aae2f7a5d35e4cb4b7
+SIZE (sonar-java-plugin-6.13.0.25138.jar) = 17476402
+SHA256 (sonar-javascript-plugin-7.2.1.14998.jar) = 99d6776d7f361bb2adeb8c2cf17c89da0d7a605c236922d4664f7019b5268c52
+SIZE (sonar-javascript-plugin-7.2.1.14998.jar) = 20191146
 SHA256 (sonar-php-plugin-3.15.0.7197.jar) = f29f93eaecc5ad139edc6f680007a2701e2aa93706d08e6703b660889f2ac05a
 SIZE (sonar-php-plugin-3.15.0.7197.jar) = 5082745
 SHA256 (sonar-python-plugin-3.2.0.7856.jar) = 6a90009745acb55d1dce30ee32bec95e60666ff78ee5a726c4181f05fed709a0
 SIZE (sonar-python-plugin-3.2.0.7856.jar) = 4613217
-SHA256 (sonar-vbnet-plugin-8.17.0.26580.jar) = 6c6ad2cbf3a7066ddae004bf78b0c8b7b354556539ed3907a4da0a18f358d51c
-SIZE (sonar-vbnet-plugin-8.17.0.26580.jar) = 3775351
+SHA256 (sonar-vbnet-plugin-8.18.0.27296.jar) = 4db548bcb627c7f0c7a7e87a2590e189de0f448f8424da4737dd6f33aed89604
+SIZE (sonar-vbnet-plugin-8.18.0.27296.jar) = 3810863