13 files changed, 13 insertions, 14 deletions
diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile
index a7e793e1a8bc..6a38f63d6b7b 100644
--- 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
diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile
index dd5769906ab3..3c621218663f 100644
--- 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
 
diff --git a/java/eclipse/Makefile.plugins b/java/eclipse/Makefile.plugins
index 52b6c47b35a9..dd4de181d4c4 100644
--- 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}
-
diff --git a/java/lightweight-java-profiler/Makefile b/java/lightweight-java-profiler/Makefile
index 0d83d2a30ccc..a4f6b84f2a10 100644
--- 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
diff --git a/java/visualvm/Makefile b/java/visualvm/Makefile
index 0f92cc4f43a3..9345c6b10880 100644
--- 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
 
diff --git a/java/wildfly14/Makefile b/java/wildfly14/Makefile
index 9de39f32c7d4..72816fa6b9df 100644
--- 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
diff --git a/java/wildfly15/Makefile b/java/wildfly15/Makefile
index 15c27cc19ebf..1515b92b60bd 100644
--- 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
diff --git a/java/wildfly16/Makefile b/java/wildfly16/Makefile
index 6ef51a2b2e96..f07659d7ea4b 100644
--- 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
diff --git a/java/wildfly17/Makefile b/java/wildfly17/Makefile
index de41c2e3d018..133457a9e2ad 100644
--- 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
diff --git a/java/wildfly18/Makefile b/java/wildfly18/Makefile
index d32487aae2e4..ddcff65ee819 100644
--- 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
diff --git a/java/wildfly24/Makefile b/java/wildfly24/Makefile
index f54cf18f67d7..a989c25952fc 100644
--- 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
diff --git a/java/wildfly25/Makefile b/java/wildfly25/Makefile
index a4a2eab44d28..9ef944d02c1a 100644
--- 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
diff --git a/java/wildfly26/Makefile b/java/wildfly26/Makefile
index b5d114323a40..827ce5d285bb 100644
--- 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