diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 9d3cb8bc425c..44ec2a331b96 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -1,86 +1,85 @@
 PORTNAME=	eclipse
-DISTVERSION=	4.36
-PORTREVISION=	1
+DISTVERSION=	4.37
 CATEGORIES=	java devel
 ECLIPSE_TAG=	R${DISTVERSION:S|.|_|g}
 
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ngrundmann@gmx.de
 COMMENT=	Eclipse IDE
 WWW=		https://www.eclipse.org/
 
 LICENSE=	EPL
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 BUILD_DEPENDS=	git:devel/git \
 		mvn:devel/maven39 \
 		zip:archivers/zip
 LIB_DEPENDS=	libsecret-1.so:security/libsecret
 RUN_DEPENDS=	webkit2-gtk_41>=0:www/webkit2-gtk@41
 
 USES=		compiler:c++17-lang gl gmake gnome java pkgconfig
 # The github repositories.  The repository under NorbertXYZ is for a predefined maven
 # download, so the build does not need to download while do-build is running
 USE_GITHUB=	yes
 GH_TUPLE=	chirontt:eclipse.platform.releng.aggregator:${ECLIPSE_TAG}_maintenance \
 		eclipse-jdt:eclipse.jdt:${ECLIPSE_TAG}:a/eclipse.jdt \
 		eclipse-jdt:eclipse.jdt.core:${ECLIPSE_TAG}:b/eclipse.jdt.core \
 		eclipse-jdt:eclipse.jdt.core.binaries:${ECLIPSE_TAG}:c/eclipse.jdt.core.binaries \
 		eclipse-jdt:eclipse.jdt.debug:${ECLIPSE_TAG}:d/eclipse.jdt.debug \
 		eclipse-jdt:eclipse.jdt.ui:${ECLIPSE_TAG}:e/eclipse.jdt.ui \
 		chirontt:eclipse.pde:${ECLIPSE_TAG}_maintenance:f/eclipse.pde \
 		chirontt:eclipse.platform:${ECLIPSE_TAG}_maintenance:g/eclipse.platform \
 		chirontt:eclipse.platform.swt:${ECLIPSE_TAG}_maintenance:i/eclipse.platform.swt \
 		chirontt:eclipse.platform.ui:${ECLIPSE_TAG}_maintenance:j/eclipse.platform.ui \
 		chirontt:equinox:${ECLIPSE_TAG}_maintenance:k/equinox \
 		chirontt:equinox.binaries:${ECLIPSE_TAG}_maintenance:l/equinox.binaries \
 		chirontt:p2:${ECLIPSE_TAG}_maintenance:m/equinox.p2 \
 		NorbertXYZ:eclipse-maven:${DISTVERSION}:n
 USE_GL=		gl glu
 USE_GNOME=	gtk30 gtk40
 JAVA_VERSION=	21+
 
 DESKTOP_ENTRIES=	"Eclipse" \
 			"${COMMENT}" \
 			"${PORTNAME}" \
 			"${PORTNAME}" \
 			"Development;IDE;Java;" \
 			"false"
 PORTSCOUT=	ignore:1
 SUB_FILES=	${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 MAVEN_ENV=	MAVEN_OPTS=-Xmx2048m CC=${CC} CFLAGS="${CFLAGS}" JAVA_HOME=${JAVA_HOME}
 
 # To make the build working, set the (maven) architecture to x86_64 instead of amd64
 # Finally there are problems with amd64
 MAVEN_ARCH=	${ARCH:S|amd64|x86_64|}
 
 MAVEN_PARAMS=	--offline \
 		-Dmaven.repo.local=${WRKDIR}/eclipse-maven-${DISTVERSION} \
 		-Dnative=gtk.freebsd.${MAVEN_ARCH} \
 		-DskipTests clean verify
 
 ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${MAVEN_ARCH}.tar.gz
 
 .if ${COMPILER_TYPE} == clang
 CFLAGS+=	-Wno-deprecated-non-prototype
 .endif
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn ${MAVEN_PARAMS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 # Generate dynamic plist, to cater for different ARCHS
 post-install:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}
 	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/java/eclipse/Makefile.plugins b/java/eclipse/Makefile.plugins
index 2d54cbe0aa77..54814b3ef0ec 100644
--- a/java/eclipse/Makefile.plugins
+++ b/java/eclipse/Makefile.plugins
@@ -1,11 +1,11 @@
 NO_BUILD=	yes
 USES+=		java
-JAVA_VERSION=	17+
+JAVA_VERSION=	21+
 
 REPO_DIRS?=	features plugins
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse
 	@(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/eclipse/distinfo b/java/eclipse/distinfo
index 5408ac479ff0..673362de6e2b 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,29 +1,29 @@
-TIMESTAMP = 1752913239
-SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.36-R4_36_maintenance_GH0.tar.gz) = 58d6734c7dd334d416b7d0255b3d71b11ee20cb7b790c0c7c6679727d0fd3611
-SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.36-R4_36_maintenance_GH0.tar.gz) = 26211750
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_36_GH0.tar.gz) = d537c10f1f7bd9159e1877c6fe8ebeafea7132e98ff5ebe6b9b09717203c5677
-SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_36_GH0.tar.gz) = 39974
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_36_GH0.tar.gz) = c2e292fd897bf6987c2f5828b3efd6a61634837f7c973842bf6fb8c11acee28f
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_36_GH0.tar.gz) = 15673901
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_36_GH0.tar.gz) = c191bc12667e600f63844dea12b01f821094773e8bf02e5eb0ec981aaf97c2bc
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_36_GH0.tar.gz) = 34885784
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_36_GH0.tar.gz) = 705d965e1941593f58eb03bf4287f220a285ff7d6f9edc2d0d7e033f4e314946
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_36_GH0.tar.gz) = 2377734
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_36_GH0.tar.gz) = 034ab6325f5d4c30129d89dcb89d1ee3a7a2554a4ad6d5af5a4e7d17d8cc7a7c
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_36_GH0.tar.gz) = 25031173
-SHA256 (eclipse/chirontt-eclipse.pde-R4_36_maintenance_GH0.tar.gz) = f0bd123252afe25b730d1cd56a5e2e134914b2199846cb9f10402a5e0a373fef
-SIZE (eclipse/chirontt-eclipse.pde-R4_36_maintenance_GH0.tar.gz) = 36060538
-SHA256 (eclipse/chirontt-eclipse.platform-R4_36_maintenance_GH0.tar.gz) = 582f5eb27de0316b228fc3fa0d962a18ed2c2cd320644a575e95139f63de9a35
-SIZE (eclipse/chirontt-eclipse.platform-R4_36_maintenance_GH0.tar.gz) = 16630323
-SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_36_maintenance_GH0.tar.gz) = 011eba684af94e73f26dd878c941a59845ab899cdba33f45d2976c2560fd0fb0
-SIZE (eclipse/chirontt-eclipse.platform.swt-R4_36_maintenance_GH0.tar.gz) = 10658980
-SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_36_maintenance_GH0.tar.gz) = c66604fb01f6d5614cb67b201c1f94273e5ea3721fe6e115ba1b24a766bc6477
-SIZE (eclipse/chirontt-eclipse.platform.ui-R4_36_maintenance_GH0.tar.gz) = 16572318
-SHA256 (eclipse/chirontt-equinox-R4_36_maintenance_GH0.tar.gz) = f6f276d6d8d69fa0cc4c9fdd1693d8bb8be98074fc9b8ce86cf2e709ab627118
-SIZE (eclipse/chirontt-equinox-R4_36_maintenance_GH0.tar.gz) = 3634382
-SHA256 (eclipse/chirontt-equinox.binaries-R4_36_maintenance_GH0.tar.gz) = 40d14c0ce3963220c21df37274348dd014973ffd20c4cc1a17ceb2ae9c7990d7
-SIZE (eclipse/chirontt-equinox.binaries-R4_36_maintenance_GH0.tar.gz) = 1620956
-SHA256 (eclipse/chirontt-p2-R4_36_maintenance_GH0.tar.gz) = 74ec993e52abb83641e12e0438bc4a9f0075a2476a17fb1c6bde4f05ff872eac
-SIZE (eclipse/chirontt-p2-R4_36_maintenance_GH0.tar.gz) = 54033925
-SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.36_GH0.tar.gz) = 0d26e1f29db214bcf8f842eca5c352f947ca9cd0906ce6d0df9b0b44bc9f9c7d
-SIZE (eclipse/NorbertXYZ-eclipse-maven-4.36_GH0.tar.gz) = 531877628
+TIMESTAMP = 1757063413
+SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.37-R4_37_maintenance_GH0.tar.gz) = 8e054a2b4922ff9e1c0a478dfbf91fc08ba127c624cf747e81900102514795b3
+SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.37-R4_37_maintenance_GH0.tar.gz) = 26193545
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_37_GH0.tar.gz) = 84c45a5314f877f3c032353d49c2cb44190e3c5245b08ebb08d5b317458b37f3
+SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_37_GH0.tar.gz) = 39942
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_37_GH0.tar.gz) = a3351fe6a1748ff4d26729dd0654dfe8837125a1c42aa63091bdf76f59b30cdb
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_37_GH0.tar.gz) = 15796506
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_37_GH0.tar.gz) = 62b940d68e6eae3a1176248be27546982afd26e5a7b09b7db8a63585e0cf29e5
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_37_GH0.tar.gz) = 34885781
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_37_GH0.tar.gz) = 3f7f3cb0152ee3d61d0aa1cf633529fe1fd2fc7fc7af4e305c64acc537b2c670
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_37_GH0.tar.gz) = 2394844
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_37_GH0.tar.gz) = a2a8f9e355ab96d45eec3cc96b11e7f7077c4c41920446f3fbe6489397d5912f
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_37_GH0.tar.gz) = 25051050
+SHA256 (eclipse/chirontt-eclipse.pde-R4_37_maintenance_GH0.tar.gz) = 200d64c686fd736991aaeafee02e9350864ee366cafcc1e13c39a4e874311c3f
+SIZE (eclipse/chirontt-eclipse.pde-R4_37_maintenance_GH0.tar.gz) = 36078994
+SHA256 (eclipse/chirontt-eclipse.platform-R4_37_maintenance_GH0.tar.gz) = 9692198c828991aed417dcc32a1a8976a22282ea93a664121ce9e8dd02a907a2
+SIZE (eclipse/chirontt-eclipse.platform-R4_37_maintenance_GH0.tar.gz) = 17332711
+SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_37_maintenance_GH0.tar.gz) = 8e6bf85d8c21c50e82391cdc5a5beb2f4a7f284c3e9625f035296b6d634e8f54
+SIZE (eclipse/chirontt-eclipse.platform.swt-R4_37_maintenance_GH0.tar.gz) = 10645986
+SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_37_maintenance_GH0.tar.gz) = aff77305b6ac126e4f400ba587f5adf2a6147b42528d10a1b68a006b2237131a
+SIZE (eclipse/chirontt-eclipse.platform.ui-R4_37_maintenance_GH0.tar.gz) = 16512282
+SHA256 (eclipse/chirontt-equinox-R4_37_maintenance_GH0.tar.gz) = 45b4d50f87ebd96e32470c03c0380f971768bf77f8638a8689856fd4b913f625
+SIZE (eclipse/chirontt-equinox-R4_37_maintenance_GH0.tar.gz) = 3914151
+SHA256 (eclipse/chirontt-equinox.binaries-R4_37_maintenance_GH0.tar.gz) = cdab9d2feefe24d15fff628220ce2c4f60ea890e5d7abb6894b8c8efe42dd533
+SIZE (eclipse/chirontt-equinox.binaries-R4_37_maintenance_GH0.tar.gz) = 1611408
+SHA256 (eclipse/chirontt-p2-R4_37_maintenance_GH0.tar.gz) = 04f7bd83a6b4ddb91f7b58947ec647ccf8d1cb8e036d4f5270a5b6d7036059b4
+SIZE (eclipse/chirontt-p2-R4_37_maintenance_GH0.tar.gz) = 54032020
+SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.37_GH0.tar.gz) = 71a59125c518fbf96d82655b03bcae173772449dc5a334b970d1103a99d7688b
+SIZE (eclipse/NorbertXYZ-eclipse-maven-4.37_GH0.tar.gz) = 528936178