From fd6aa48fbffc80ef2f1c06392fe7136bb90da676 Mon Sep 17 00:00:00 2001
From: Joao Ferreira <Joao.Ferreira@avaloq.com>
Date: Wed, 30 Sep 2026 11:24:15 +0200
Subject: [PATCH 1/2] build: target update to Eclipse 2026-09

Move the platform to simrel 2026-09 (Eclipse 4.41) and Orbit to 4.41.0,
bumping the pinned Orbit units that 4.41.0 no longer ships (byte-buddy
1.18.12, objenesis 3.6.0, log4j 2.26.1, JUnit 6.1.3). EMF, MWE, Xtext
(2.43.0), LSP4J and SWTBot stay as they are.
---
 ddk-target/ddk.target | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index ac3cf107a..c2d7b240b 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -16,7 +16,7 @@
     <unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
     <unit id="org.eclipse.jdt.junit.runtime" version="0.0.0"/>
     <unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
-    <repository location="https://download.eclipse.org/releases/2026-06/"/>
+    <repository location="https://download.eclipse.org/releases/2026-09/"/>
   </location>
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
   <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
@@ -37,25 +37,25 @@
     <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
   </location>
   <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-    <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.40.0"/>
-    <unit id="net.bytebuddy.byte-buddy" version="1.18.8"/>
-    <unit id="org.objenesis" version="3.5.0"/>
+    <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.41.0"/>
+    <unit id="net.bytebuddy.byte-buddy" version="1.18.12"/>
+    <unit id="org.objenesis" version="3.6.0"/>
     <unit id="org.mockito.mockito-core" version="5.23.0"/>
     <unit id="org.hamcrest" version="3.0.0"/>
     <unit id="org.apache.commons.logging" version="1.2.0"/>
     <unit id="org.apache.commons.text" version="1.15.0"/>
     <unit id="org.apache.commons.lang3" version="3.20.0"/>
-    <unit id="org.apache.logging.log4j.core" version="2.26.0"/>
-    <unit id="org.apache.logging.log4j.api" version="2.26.0"/>
+    <unit id="org.apache.logging.log4j.core" version="2.26.1"/>
+    <unit id="org.apache.logging.log4j.api" version="2.26.1"/>
     <unit id="org.apache.log4j" version="1.2.26"/> <!--use reload4j 1.2.26 for org.eclipse.xtext dependencies to log4j-->
-    <unit id="junit-jupiter-api" version="6.1.0"/>
-    <unit id="junit-jupiter-engine" version="6.1.0"/>
-    <unit id="junit-jupiter-params" version="6.1.0"/>
-    <unit id="junit-platform-commons" version="6.1.0"/>
-    <unit id="junit-platform-engine" version="6.1.0"/>
-    <unit id="junit-platform-launcher" version="6.1.0"/>
-    <unit id="junit-platform-suite-api" version="6.1.0"/>
-    <unit id="junit-platform-suite-engine" version="6.1.0"/>
+    <unit id="junit-jupiter-api" version="6.1.3"/>
+    <unit id="junit-jupiter-engine" version="6.1.3"/>
+    <unit id="junit-jupiter-params" version="6.1.3"/>
+    <unit id="junit-platform-commons" version="6.1.3"/>
+    <unit id="junit-platform-engine" version="6.1.3"/>
+    <unit id="junit-platform-launcher" version="6.1.3"/>
+    <unit id="junit-platform-suite-api" version="6.1.3"/>
+    <unit id="junit-platform-suite-engine" version="6.1.3"/>
   </location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>

From 087d704a2d928735e7f071fd765a3d83de1959da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Dinis=20Ferreira?= <hello@joaof.eu>
Date: Wed, 30 Sep 2026 12:21:48 +0200
Subject: [PATCH 2/2] build: drop the unused com.ibm.icu requirements

The Eclipse 4.41 platform no longer pulls in ICU4J (com.ibm.icu), so the
2026-09 target does not contain it and the bundles that still require it
cannot resolve. No DDK code uses it: the requirements date from Xtext
versions whose generators imported ICU, when MWE2 workflows needed it on
their classpath. Also drop the bundle from the devkit launch
configuration.

Bump xtext.export.generator to 17.3.2: its manifest changed and it was
still at its 19.2.0 release version.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 com.avaloq.tools.ddk.workflow/META-INF/MANIFEST.MF             | 1 -
 .../META-INF/MANIFEST.MF                                       | 3 +--
 com.avaloq.tools.ddk.xtext.export.generator/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF     | 1 -
 ddk-configuration/launches/devkit-run.launch                   | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/com.avaloq.tools.ddk.workflow/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.workflow/META-INF/MANIFEST.MF
index 2cdf749ed..4b65545ba 100644
--- a/com.avaloq.tools.ddk.workflow/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.workflow/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
  com.avaloq.tools.ddk.check.core,
  com.avaloq.tools.ddk.checkcfg.core,
  com.avaloq.tools.ddk.typesystem,
- com.ibm.icu,
  org.antlr.runtime,
  org.eclipse.xtext.xbase,
  org.eclipse.core.runtime,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
index c54f489ae..c2cf81950 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true
-Bundle-Version: 17.3.1.qualifier
+Bundle-Version: 17.3.2.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: org.apache.logging.log4j
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
  org.eclipse.xtext.util,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
index 8f7553c68..285513124 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.1-SNAPSHOT</version>
+  <version>17.3.2-SNAPSHOT</version>
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>com.avaloq.tools.ddk.xtext.export.generator</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index 5dcc4ad84..3a4d387e1 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.util,
  org.eclipse.emf.ecore,
diff --git a/ddk-configuration/launches/devkit-run.launch b/ddk-configuration/launches/devkit-run.launch
index 4ebc23be1..28f8fd3c2 100644
--- a/ddk-configuration/launches/devkit-run.launch
+++ b/ddk-configuration/launches/devkit-run.launch
@@ -26,7 +26,6 @@
 <setAttribute key="selected_target_bundles">
 <setEntry value="com.google.guava@default:default"/>
 <setEntry value="com.google.inject@default:default"/>
-<setEntry value="com.ibm.icu@default:default"/>
 <setEntry value="com.jcraft.jsch@default:default"/>
 <setEntry value="com.sun.el@default:default"/>
 <setEntry value="javax.el@default:default"/>