From f060c220008676f9f5239225f6b925db385ebc6d Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Mon, 16 Mar 2026 16:40:23 +0100 Subject: [PATCH 1/4] Oomph Targlet: limit to LcDSL 1.1.0 because latest LcDSL (2.0.0) requires Eclipse 2025-12 --- oomph/EclipseTEA.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oomph/EclipseTEA.setup b/oomph/EclipseTEA.setup index 38ed2fc..cd7dd5e 100644 --- a/oomph/EclipseTEA.setup +++ b/oomph/EclipseTEA.setup @@ -113,7 +113,7 @@ + url="https://github.com/ssi-schaefer/lcdsl/releases/download/1.1.0/"/> From 532a28ea02e37f34fdb3d2058db24de94e27fe3f Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Mon, 16 Mar 2026 16:39:49 +0100 Subject: [PATCH 2/4] eclipse-2025-12.target: bump LcDSL 2.0.0, EASE nightly LcDSL 2.0.0 requires Eclipse 2025-12 EASE nightly was updated --- sites/org.eclipse.tea.repository/eclipse-2025-12.target | 8 ++++---- sites/org.eclipse.tea.repository/eclipse-2025-12.tpd | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/org.eclipse.tea.repository/eclipse-2025-12.target b/sites/org.eclipse.tea.repository/eclipse-2025-12.target index 7666746..c9c6179 100644 --- a/sites/org.eclipse.tea.repository/eclipse-2025-12.target +++ b/sites/org.eclipse.tea.repository/eclipse-2025-12.target @@ -1,7 +1,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -54,8 +54,8 @@ - - + + diff --git a/sites/org.eclipse.tea.repository/eclipse-2025-12.tpd b/sites/org.eclipse.tea.repository/eclipse-2025-12.tpd index 594e455..42e3396 100644 --- a/sites/org.eclipse.tea.repository/eclipse-2025-12.tpd +++ b/sites/org.eclipse.tea.repository/eclipse-2025-12.tpd @@ -60,6 +60,6 @@ location "https://download.eclipse.org/tracecompass.incubator/2024-12/master/rcp org.jython } -location "https://github.com/ssi-schaefer/lcdsl/releases/download/1.1.0/" { +location "https://github.com/ssi-schaefer/lcdsl/releases/download/2.0.0/" { com.wamas.ide.launching.feature.feature.group } From 49ac5b67e60722018989edb4f93f8822698f505e Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Mon, 16 Mar 2026 16:41:48 +0100 Subject: [PATCH 3/4] add eclipse-2026-03 target definition but stick to 2024-09 as required still --- .../eclipse-2026-03.target | 61 ++++++++++++++++++ .../eclipse-2026-03.tpd | 64 +++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 sites/org.eclipse.tea.repository/eclipse-2026-03.target create mode 100644 sites/org.eclipse.tea.repository/eclipse-2026-03.tpd diff --git a/sites/org.eclipse.tea.repository/eclipse-2026-03.target b/sites/org.eclipse.tea.repository/eclipse-2026-03.target new file mode 100644 index 0000000..c5c0b3a --- /dev/null +++ b/sites/org.eclipse.tea.repository/eclipse-2026-03.target @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/org.eclipse.tea.repository/eclipse-2026-03.tpd b/sites/org.eclipse.tea.repository/eclipse-2026-03.tpd new file mode 100644 index 0000000..36bd772 --- /dev/null +++ b/sites/org.eclipse.tea.repository/eclipse-2026-03.tpd @@ -0,0 +1,64 @@ +target "Eclipse 2025-12" + +with source requirements +environment JavaSE-21 + +location "https://download.eclipse.org/releases/2026-03/202603111000/" { + com.google.gson + com.google.guava [33,34) + com.google.inject + + io.github.classgraph.classgraph + com.googlecode.javaewah.JavaEWAH + + org.aopalliance + + org.apache.commons.codec + org.apache.commons.commons-io + org.apache.httpcomponents.httpclient + org.apache.httpcomponents.httpcore + org.apache.log4j + org.apache.sshd.osgi + org.apache.sshd.sftp + + org.eclipse.draw2d.feature.group + org.eclipse.e4.ui.progress + org.eclipse.e4.tools.emf.ui + org.eclipse.e4.tools.services + org.eclipse.ecf + org.eclipse.ecf.identity + org.eclipse.ecf.filetransfer + org.eclipse.egit.feature.group + org.eclipse.emf.feature.group + org.eclipse.jgit.feature.group + org.eclipse.jgit.gpg.bc.feature.group + org.eclipse.jgit.http.apache.feature.group + org.eclipse.jgit.lfs.feature.group + org.eclipse.jgit.ssh.apache.feature.group + org.eclipse.m2e.feature.feature.group + org.eclipse.sdk.feature.group + org.eclipse.xtext.sdk.feature.group + + org.objectweb.asm + org.objectweb.asm.tree + + org.sat4j.core + org.sat4j.pb + + slf4j.api +} + +location "https://download.eclipse.org/ease/integration/nightly/" { + org.eclipse.ease.feature.feature.group + org.eclipse.ease.lang.python.feature.feature.group + org.eclipse.ease.ui.feature.feature.group + org.eclipse.ease.python.jython.feature.feature.group +} + +location "https://download.eclipse.org/tracecompass.incubator/2024-12/master/rcp-repository" { + org.jython +} + +location "https://github.com/ssi-schaefer/lcdsl/releases/download/2.0.0/" { + com.wamas.ide.launching.feature.feature.group +} From 388fb811ddc7e9b9589e9ef9ba5804ad29ddd273 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Mon, 16 Mar 2026 16:44:53 +0100 Subject: [PATCH 4/4] redirect p2.Director output again org.eclipse.equinox.internal.p2.director.app.ILog.log() is gone: was deprecated in 2024-09 already, default impl redirects to printOut() Therefore, we just need to implement printOut (as well as printErr) instead, and be compatible to 2024-09 still. There was a bug in not overriding printOut() and printErr(), which shows up as compilation error with Eclipse 2026-03 as Target Platform, where the old API is gone now. --- .../library/build/tasks/p2/TaskingLogLoggerDelegate.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/p2/TaskingLogLoggerDelegate.java b/bundles/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/p2/TaskingLogLoggerDelegate.java index 2fbcf1e..c4b9478 100644 --- a/bundles/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/p2/TaskingLogLoggerDelegate.java +++ b/bundles/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/p2/TaskingLogLoggerDelegate.java @@ -50,8 +50,13 @@ private void log(IStatus status, String indent) { } @Override - public void log(String message) { - log.info(message); + public void printOut(String line) { + log.info(line); + } + + @Override + public void printErr(String line) { + log.error(line); } @Override