diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 39e95819957d..586736265dd6 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -1,87 +1,85 @@
 PORTNAME=	eclipse
-DISTVERSION=	4.34
-PORTREVISION=	2
+DISTVERSION=	4.35
 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
 
-LIB_DEPENDS=	libsecret-1.so:security/libsecret \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
-
-USES=		compiler:c++17-lang gl gmake java pkgconfig gnome
+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
+		NorbertXYZ:eclipse-maven:${DISTVERSION}:n
 USE_GL=		gl glu
-USE_GNOME=	gtk30
-JAVA_VERSION=	17+
+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} \
+		-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/distinfo b/java/eclipse/distinfo
index 14184e4c33bc..0a2394b33a62 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,29 +1,29 @@
-TIMESTAMP = 1736155523
-SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.34-R4_34_maintenance_GH0.tar.gz) = d362c5cb3fd551db3a0c5455e7e39580a58a2f1b12d0de6bfde5b21551f402b2
-SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.34-R4_34_maintenance_GH0.tar.gz) = 24567101
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_34_GH0.tar.gz) = 4379ccadaf8566079c2cc630bf8b9c44d708f4664dcb12b420ecabfd157fc36f
-SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_34_GH0.tar.gz) = 39562
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_34_GH0.tar.gz) = 22f6d9a0764171b882b408a3600f3dad420ee20ecde6e0880981b7289577d1f4
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_34_GH0.tar.gz) = 15894853
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_34_GH0.tar.gz) = 93e044cfd49da00190565375bcddfeef270e1f8eb8b2f44f9095bebe897c5970
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_34_GH0.tar.gz) = 34885476
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_34_GH0.tar.gz) = cc1995a99de1ca544102469a1abe7cba9abfc423d8499838c37b1bce54254bfc
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_34_GH0.tar.gz) = 2151262
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_34_GH0.tar.gz) = 3c49023331aa24f7928274a92705e7053bf965224c7ce9b6e6cfb63bdc027a3a
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_34_GH0.tar.gz) = 23344110
-SHA256 (eclipse/chirontt-eclipse.pde-R4_34_maintenance_GH0.tar.gz) = 90cc56fffaffdb8c6386973b0094cc7f0a385729e26a6bb6a64b7511aa6ca5e9
-SIZE (eclipse/chirontt-eclipse.pde-R4_34_maintenance_GH0.tar.gz) = 34755155
-SHA256 (eclipse/chirontt-eclipse.platform-R4_34_maintenance_GH0.tar.gz) = d8e4e8eeb2aac56d9ff054530685466d31ee63650bbfe26bad9fc5da8e552419
-SIZE (eclipse/chirontt-eclipse.platform-R4_34_maintenance_GH0.tar.gz) = 16488404
-SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_34_maintenance_GH0.tar.gz) = 31f66f6ca20e9563e059c88253b77c33eee2023b1ca8b6094b3d50da9f738ca0
-SIZE (eclipse/chirontt-eclipse.platform.swt-R4_34_maintenance_GH0.tar.gz) = 9201223
-SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_34_maintenance_GH0.tar.gz) = b34e9af96a87d3f61b5ef4cec763eadea0f1c913f661dbe9ee781e9ba448a4ae
-SIZE (eclipse/chirontt-eclipse.platform.ui-R4_34_maintenance_GH0.tar.gz) = 15477002
-SHA256 (eclipse/chirontt-equinox-R4_34_maintenance_GH0.tar.gz) = 2d9993db71447e511bc1512b19960001147a2461276cd4211f95c72185131cdb
-SIZE (eclipse/chirontt-equinox-R4_34_maintenance_GH0.tar.gz) = 3576630
-SHA256 (eclipse/chirontt-equinox.binaries-R4_34_maintenance_GH0.tar.gz) = 29853f7034a4e6d174e23f3ed2147cfbbdd4eafeb31fe72a08c91715a2161c9d
-SIZE (eclipse/chirontt-equinox.binaries-R4_34_maintenance_GH0.tar.gz) = 1622853
-SHA256 (eclipse/chirontt-p2-R4_34_maintenance_GH0.tar.gz) = b8290a7bde3adbc25c8d905a982551251b053df05bc6c1e64182533dffdd851d
-SIZE (eclipse/chirontt-p2-R4_34_maintenance_GH0.tar.gz) = 54411977
-SHA256 (eclipse/NorbertXYZ-eclipse_maven-4.34_GH0.tar.gz) = 6e5056acc71a301e839a74e5ae3b441c921c6ea751c5392f86e8e8301d83515d
-SIZE (eclipse/NorbertXYZ-eclipse_maven-4.34_GH0.tar.gz) = 481423656
+TIMESTAMP = 1743576596
+SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.35-R4_35_maintenance_GH0.tar.gz) = 2fcb4b9958d13e58f758c3c1a0c10b941c0d5a745b128aa93a73a4ae9f67212c
+SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.35-R4_35_maintenance_GH0.tar.gz) = 26236823
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_35_GH0.tar.gz) = 46823539473fd9a4e3f976f14e7bdad3c6730a22163413cae1e0334e68132c84
+SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_35_GH0.tar.gz) = 39729
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_35_GH0.tar.gz) = 8ba8a83865d2922d0f0b86985b34372aa3c3ea6e25f6a0512752ea9ab27b9c07
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_35_GH0.tar.gz) = 15659847
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_35_GH0.tar.gz) = 5d76780c7bde91d35fe13d78c10c0bf47115e9d444389243c8df67e92ba1f569
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_35_GH0.tar.gz) = 34885476
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_35_GH0.tar.gz) = 08162d9029ccbbf61338e1281f3c17e6271ea726e8a1ec0cf71c824bc63b1e27
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_35_GH0.tar.gz) = 2177096
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_35_GH0.tar.gz) = 460f3dd79ab48a68c7f91b7633c5d01faa1770741d0cfcc37174a23fdbe5e893
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_35_GH0.tar.gz) = 24041044
+SHA256 (eclipse/chirontt-eclipse.pde-R4_35_maintenance_GH0.tar.gz) = be94fb6edd85240c995125ba04c90806e68f13acc86333f3cdd755b11a07d68c
+SIZE (eclipse/chirontt-eclipse.pde-R4_35_maintenance_GH0.tar.gz) = 35112342
+SHA256 (eclipse/chirontt-eclipse.platform-R4_35_maintenance_GH0.tar.gz) = 6f4c89696253e60053b89dfb961f9542d033eef2e62a75869883fbc1867166e5
+SIZE (eclipse/chirontt-eclipse.platform-R4_35_maintenance_GH0.tar.gz) = 16489404
+SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_35_maintenance_GH0.tar.gz) = e390e06d0344899758b02409ba879c889f2ee106a3126f328dbb6a1156d5b872
+SIZE (eclipse/chirontt-eclipse.platform.swt-R4_35_maintenance_GH0.tar.gz) = 9218730
+SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_35_maintenance_GH0.tar.gz) = 65fd3630cf3bc4bc0e6578cc8b253f4a5ff9ccecfaa2ecde2caa21038c83c65d
+SIZE (eclipse/chirontt-eclipse.platform.ui-R4_35_maintenance_GH0.tar.gz) = 15572004
+SHA256 (eclipse/chirontt-equinox-R4_35_maintenance_GH0.tar.gz) = c751ee64dcd8a99ede5683d87227b0aba91cfab75295aaf8eb26ad91c0a42ce6
+SIZE (eclipse/chirontt-equinox-R4_35_maintenance_GH0.tar.gz) = 3593501
+SHA256 (eclipse/chirontt-equinox.binaries-R4_35_maintenance_GH0.tar.gz) = 679126ad2bb35b946a9e02c3e0177db06ea10a248ac58bc4f7f41fe2b9f9e295
+SIZE (eclipse/chirontt-equinox.binaries-R4_35_maintenance_GH0.tar.gz) = 1621098
+SHA256 (eclipse/chirontt-p2-R4_35_maintenance_GH0.tar.gz) = 9df1e4eef2095f0090b373f18a5806b1c947a8412a3f3143436f2d9b07b8dba8
+SIZE (eclipse/chirontt-p2-R4_35_maintenance_GH0.tar.gz) = 53845413
+SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.35_GH0.tar.gz) = 121a6015ee06fbc157afab0f44eb6e4afde98e7a969f91de315c816f4ba87d70
+SIZE (eclipse/NorbertXYZ-eclipse-maven-4.35_GH0.tar.gz) = 495455311