*/*: Refactor java/openjdk7 removal

- java/openjdk7* has been removed from the tree since 2022-09-03 however the relevant codebases in bsd.java.mk has not been removed and the consumers has also not been updated to use the next jdk version. This commit updates all relevant consumers to use JAVA_VERSION=8 instead of JAVA_VERSION=1.7 - Since the introduction of jdk version 18 it looks like similar with jdk version 8(java version string 1.8). This is prone to error as it looks similar and is only seperated by a '.'. Remove using JAVA_VERSION with dotted fomat of java version string and update all consumers to utilize version 8 instead of 1.8. Approved by: portmgr (blanket)
2024-11-18 00:10:04 +00:00 · 2023-04-04 13:04:17 -05:00 · 2023-04-04 13:04:17 -05:00 · 4cda17ab14
commit 4cda17ab14
parent cfff80b529
57 changed files with 59 additions and 60 deletions
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@ -22,7 +22,7 @@ Java_Include_MAINTAINER=	java@FreeBSD.org
 #
 # JAVA_VERSION		List of space-separated suitable java versions for the
 #					port. An optional "+" allows you to specify a range of
-#					versions. (allowed values: 7[+] 8[+] 11[+] 17[+] 18[+])
+#					versions. (allowed values: 8[+] 11[+] 17[+] 18[+])
 #
 # JAVA_OS			List of space-separated suitable JDK port operating systems
 #					for the port. (allowed values: native linux)
@ -159,7 +159,7 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .    endif

 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	7 8 11 17 18
+__JAVA_VERSION_LIST=	8 11 17 18
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
 _JAVA_VENDOR_LIST=		openjdk oracle
@ -265,7 +265,7 @@ JAVA_RUN=	jre
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .    if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18/}
+_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18/}
 .    else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .    endif
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@ -17,7 +17,7 @@ NO_WRKSUBDIR=	yes

 USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 NO_BUILD=	yes
 NO_ARCH=	yes
--- a/astro/mkgmap-splitter/Makefile
+++ b/astro/mkgmap-splitter/Makefile
@ -9,7 +9,7 @@ COMMENT=	Tile splitter for mkgmap
 WWW=		https://www.mkgmap.org.uk/doc/splitter.html

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 NO_BUILD=	yes
 NO_ARCH=	yes

--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@ -11,7 +11,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 NO_BUILD=	yes
 NO_ARCH=	yes

--- a/benchmarks/typometer/Makefile
+++ b/benchmarks/typometer/Makefile
@ -13,7 +13,7 @@ LICENSE=	APACHE20

 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 NO_BUILD=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- a/biology/canu/Makefile
+++ b/biology/canu/Makefile
@ -22,7 +22,7 @@ USES=		compiler:c++11-lang gmake localbase perl5 tar:xz
 USE_JAVA=	yes

 JAVA_RUN=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 WRKSRC_SUBDIR=	src
 # Upstream Makefile compiles directly into ${DESTDIR}${PREFIX} rather than
--- a/biology/picard-tools/Makefile
+++ b/biology/picard-tools/Makefile
@ -14,7 +14,7 @@ LICENSE=	MIT

 RUN_DEPENDS=	samtools:biology/samtools

-USE_JAVA=	1.8+
+USE_JAVA=	8+
 JAVA_RUN=	yes

 CONFLICTS_INSTALL=	picard # bin/picard
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@ -20,7 +20,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAV
 USES=		cpe python:3.6+
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8
+JAVA_VERSION=	8
 JAVA_VENDOR=	openjdk
 CPE_VENDOR=	apache

--- a/databases/cassandra4/Makefile
+++ b/databases/cassandra4/Makefile
@ -31,7 +31,7 @@ CPE_VENDOR=	apache

 CONFLICTS=	cassandra3

-JAVA_VERSION=	8 11
+JAVA_VERSION=	8+
 JAVA_VENDOR=	openjdk

 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
--- a/databases/db18/Makefile
+++ b/databases/db18/Makefile
@ -67,7 +67,7 @@ JAVA_CONFIGURE_ENV=	JAR="${JAR}" \
 			JAVAC="${JAVAC}"
 JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
 JAVA_VARS=		DBLIBS+=libdb_java \
-			JAVA_VERSION="7+"
+			JAVA_VERSION="8+"
 L10N_CONFIGURE_ENABLE=	localization
 TCL_USES=		tcl
 TCL_CONFIGURE_ENABLE=	tcl
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@ -56,7 +56,7 @@ L10N_CONFIGURE_ENABLE=	localization
 JAVA_USE=		java
 # db5 is incompatible with openjdk8 and causes IllegalArgument
 # exceptions during build
-JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="1.7"
+JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="8"
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
 JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" JAVACFLAGS="-Xlint:unchecked"
--- a/databases/jdbc-oracle11g/Makefile
+++ b/databases/jdbc-oracle11g/Makefile
@ -19,7 +19,7 @@ LICENSE_TEXT=	Packaging prohibited by Oracle license
 LICENSE_PERMS=	auto-accept

 USE_JAVA=	yes
-JAVA_VERSION=	1.7 1.8
+JAVA_VERSION=	8
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes

--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@ -25,7 +25,7 @@ NO_BUILD=	yes

 CONFLICTS_INSTALL=	mysql-connector-java51 # share/java/classes/mysql-connector-java.jar

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 EXTRADOCS=	CHANGES

 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
--- a/databases/mysql-connector-java51/Makefile
+++ b/databases/mysql-connector-java51/Makefile
@ -23,7 +23,7 @@ CONFLICTS_INSTALL=	mysql-connector-java # share/java/classes/mysql-connector-jav

 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.7 1.8
+JAVA_VERSION=	8
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
--- a/databases/sql-workbench/Makefile
+++ b/databases/sql-workbench/Makefile
@ -14,7 +14,7 @@ LICENSE=	APACHE20

 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
--- a/devel/ammonite/Makefile
+++ b/devel/ammonite/Makefile
@ -14,7 +14,7 @@ WWW=		https://ammonite.io/
 LICENSE=	MIT

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 NO_ARCH=	yes
 NO_BUILD=	yes
--- a/devel/antlr4/Makefile
+++ b/devel/antlr4/Makefile
@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 INSTALL_JAR=	${DISTFILES}
 SUB_LIST=	INSTALL_JAR=${INSTALL_JAR}
 SUB_FILES=	antlr.sh
--- a/devel/arduino18/Makefile
+++ b/devel/arduino18/Makefile
@ -54,7 +54,7 @@ WRKSRC_SUBDIR=	build
 PATCH_WRKSRC=	${WRKSRC}/../
 MAKE_ARGS+=	-Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USE_ANT=	yes
 OS_DIR=		${WRKSRC}/linux
 BUILD_DIR=	${OS_DIR}/work
--- a/devel/artifactory/Makefile
+++ b/devel/artifactory/Makefile
@ -21,7 +21,7 @@ USES=		cpe shebangfix zip
 CPE_VENDOR=	jfrog
 SHEBANG_FILES=	bin/artifactory.sh
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 JAVA_VENDOR=	openjdk
 NO_BUILD=	yes
 NO_ARCH=	yes
--- a/devel/bazel029/Makefile
+++ b/devel/bazel029/Makefile
@ -34,7 +34,7 @@ CPE_VENDOR=	google
 SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
 USE_JAVA=	yes
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.8
+JAVA_VERSION=	8
 JAVA_BUILD=	yes
 JAVA_RUN=	yes

--- a/devel/dbus-java/Makefile
+++ b/devel/dbus-java/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	libunix-java.so:devel/libmatthew

 USES=		gettext gmake
 USE_JAVA=	yes
-JAVA_VERSION=	7+
+JAVA_VERSION=	8+

 MAKE_ARGS=	MANPREFIX=${MAN1PREFIX}/share/man/man1
 .if defined(WITH_DEBUG)
--- a/devel/gradle5/Makefile
+++ b/devel/gradle5/Makefile
@ -13,7 +13,7 @@ LICENSE=	APACHE20

 NO_ARCH=	yes
 USES=		cpe zip
-JAVA_VERSION=	1.7+
+JAVA_VERSION=	8+
 USE_JAVA=	yes
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
--- a/devel/mill/Makefile
+++ b/devel/mill/Makefile
@ -14,7 +14,7 @@ WWW=		https://www.lihaoyi.com/mill/
 LICENSE=	MIT

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 NO_ARCH=	yes
 NO_BUILD=	yes
--- a/devel/umlgraph/Makefile
+++ b/devel/umlgraph/Makefile
@ -11,7 +11,7 @@ LICENSE=	BSD3CLAUSE

 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8
+JAVA_VERSION=	8
 USE_GITHUB=	yes
 GH_ACCOUNT=	dspinellis
 GH_PROJECT=	UMLGraph
--- a/games/minecraft-client/Makefile
+++ b/games/minecraft-client/Makefile
@ -18,7 +18,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/lwjgl/lwjgl.jar:games/lwjgl \

 USES=		openal
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk

--- a/games/multimc/Makefile
+++ b/games/multimc/Makefile
@ -18,7 +18,7 @@ GH_PROJECT=	MultiMC5
 GH_TUPLE=	MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus \
 		MultiMC:quazip:3691d57:quazip/libraries/quazip
 USE_LDCONFIG=	yes
-USE_JAVA=	1.8+
+USE_JAVA=	8+
 USE_QT=		core concurrent gui network testlib:build widgets xml \
 		buildtools:build qmake:build

--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@ -31,7 +31,7 @@ LICENSE_PERMS_JYTHON=	auto-accept

 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 NO_ARCH=	yes
 NO_BUILD=	yes
--- a/graphics/yed/Makefile
+++ b/graphics/yed/Makefile
@ -18,7 +18,7 @@ LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 USES=		cpe zip
 CPE_VENDOR=	yworks
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 DESKTOP_ENTRIES="yEd" "${COMMENT}" "" "yed" "Graphics;" false

--- a/java/eclipse-cdt/Makefile
+++ b/java/eclipse-cdt/Makefile
@ -19,7 +19,7 @@ USES=		zip
 USE_JAVA=	YES
 JAVA_OS=	native
 JAVA_RUN=	YES
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 NO_BUILD=	YES
 NO_WRKSUBDIR=	YES
--- a/java/eclipse-pydev/Makefile
+++ b/java/eclipse-pydev/Makefile
@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:java/eclipse
 USES=		python zip

 USE_JAVA=	YES
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 JAVA_OS=	native
 JAVA_RUN=	YES

--- a/java/eclipse/Makefile.plugins
+++ b/java/eclipse/Makefile.plugins
@ -1,6 +1,6 @@
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 REPO_DIRS?=	features plugins

@ -9,4 +9,3 @@ do-install:
 	@(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/)
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST}
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d -empty) | ${SED} -ne 's,^,@dir ,p' >> ${TMPPLIST}
-
--- a/java/lightweight-java-profiler/Makefile
+++ b/java/lightweight-java-profiler/Makefile
@ -20,7 +20,7 @@ GH_ACCOUNT=	inevity
 GH_TAGNAME=	e8041b5

 USE_JAVA=	yes
-JAVA_VERSION=	1.8
+JAVA_VERSION=	8

 USE_LDCONFIG=	yes
 USES=		gmake shebangfix
--- a/java/visualvm/Makefile
+++ b/java/visualvm/Makefile
@ -16,7 +16,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 USES=		desktop-file-utils zip:infozip
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 WRKSRC=		${WRKDIR}/visualvm_${PORTVERSION:S/.//g}
 SUB_FILES=	visualvm.desktop

--- a/java/wildfly14/Makefile
+++ b/java/wildfly14/Makefile
@ -12,7 +12,7 @@ LICENSE=	GPLv2

 USE_RC_SUBR=	wildfly14
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/java/wildfly15/Makefile
+++ b/java/wildfly15/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	wildfly15
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/java/wildfly16/Makefile
+++ b/java/wildfly16/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	wildfly16
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/java/wildfly17/Makefile
+++ b/java/wildfly17/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	wildfly17
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/java/wildfly18/Makefile
+++ b/java/wildfly18/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	wildfly18
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/java/wildfly24/Makefile
+++ b/java/wildfly24/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	wildfly24
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/java/wildfly25/Makefile
+++ b/java/wildfly25/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	wildfly25
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/java/wildfly26/Makefile
+++ b/java/wildfly26/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	wildfly26
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@ -14,7 +14,7 @@ RUN_DEPENDS=	bash:shells/bash \
 		rlwrap:devel/rlwrap

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 NO_ARCH=	yes
 NO_BUILD=	yes

--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@ -16,7 +16,7 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		cpe
 USE_JAVA=	yes

-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 NO_BUILD=	yes

 JRUBY_HOME?=	${PREFIX}/share/${PORTNAME}
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@ -15,7 +15,7 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		cpe
 CPE_VENDOR=	${PORTNAME}-lang
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 NO_ARCH=	yes
 NO_BUILD=	yes
--- a/misc/openhab2/Makefile
+++ b/misc/openhab2/Makefile
@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.TXT

 USES=		cpe zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.8
+JAVA_VERSION=	8
 JAVA_RUN=	yes
 USE_RC_SUBR=	openhab2
 SUB_FILES=	pkg-message update.freebsd
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@ -21,7 +21,7 @@ USE_GITHUB=	YES
 GH_ACCOUNT=	igniterealtime
 GH_PROJECT=	Openfire
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 USE_RC_SUBR=	${PORTNAME}
 NO_ARCH=	yes
--- a/net-mgmt/riemann/Makefile
+++ b/net-mgmt/riemann/Makefile
@ -15,7 +15,7 @@ USES=		tar:bzip2
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 SUB_LIST=	JAVA_HOME=${JAVA_HOME}

--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@ -19,7 +19,7 @@ RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg

 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8
+JAVA_VERSION=	8
 USES=		dos2unix
 DOS2UNIX_GLOB=	derby.properties

--- a/sysutils/digdag/Makefile
+++ b/sysutils/digdag/Makefile
@ -12,7 +12,7 @@ WWW=		https://www.digdag.io/
 LICENSE=	APACHE20

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	yes
 USE_RC_SUBR=	${PORTNAME}
--- a/sysutils/puppetserver6/Makefile
+++ b/sysutils/puppetserver6/Makefile
@ -29,7 +29,7 @@ USE_RC_SUBR=	puppetserver
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 CONFLICTS_INSTALL=	puppetserver7

--- a/sysutils/puppetserver7/Makefile
+++ b/sysutils/puppetserver7/Makefile
@ -26,7 +26,7 @@ USE_RC_SUBR=	puppetserver
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 CONFLICTS_INSTALL=	puppetserver5 puppetserver6

--- a/sysutils/rundeck2/Makefile
+++ b/sysutils/rundeck2/Makefile
@ -16,7 +16,7 @@ DEPRECATED=	unmaintained and newer version available in sysutils/rundeck3
 EXPIRATION_DATE=	2023-05-17

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+

 CONFLICTS_INSTALL=	rundeck3

--- a/sysutils/rundeck3/Makefile
+++ b/sysutils/rundeck3/Makefile
@ -18,7 +18,7 @@ EXPIRATION_DATE=	2023-09-23
 USES=		cpe
 CPE_VENDOR=	pagerduty
 USE_JAVA=	yes
-JAVA_VERSION=	8 11
+JAVA_VERSION=	8+
 USE_RC_SUBR=	rundeck

 CONFLICTS_INSTALL=	rundeck2
--- a/www/libresonic-standalone/Makefile
+++ b/www/libresonic-standalone/Makefile
@ -49,7 +49,7 @@ EXTRACT_AFTER_ARGS=	libresonic.war

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 JAVA_RUN=	yes
 # Don't waste UID/GID and reuse Subsonic's user.
 USERS=		subsonic
--- a/www/payara/Makefile
+++ b/www/payara/Makefile
@ -11,7 +11,7 @@ LICENSE_COMB=	dual

 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 NO_BUILD=	yes

 WRKSRC=		${WRKDIR}/payara5
--- a/www/selenium/Makefile
+++ b/www/selenium/Makefile
@ -16,7 +16,7 @@ USES=		cpe
 CPE_VENDOR=	jenkins

 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 JAVA_RUN=	yes

 USE_RC_SUBR=	selenium
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@ -16,7 +16,7 @@ RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}

 NO_ARCH=	yes