diff --git a/java/bundles/org.eclipse.set.basis/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.basis/META-INF/MANIFEST.MF
index 4d9b985ce7..d733b722db 100644
--- a/java/bundles/org.eclipse.set.basis/META-INF/MANIFEST.MF
+++ b/java/bundles/org.eclipse.set.basis/META-INF/MANIFEST.MF
@@ -54,7 +54,6 @@ Import-Package: com.google.common.collect,
org.eclipse.jface.dialogs,
org.eclipse.jface.operation,
org.eclipse.jface.resource,
- org.eclipse.jface.text,
org.eclipse.jface.text.rules,
org.eclipse.jface.window,
org.eclipse.osgi.util,
@@ -72,4 +71,5 @@ Require-Bundle: com.google.guava,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
org.eclipse.set.rcp.compatibility;bundle-version="0.1.0";resolution:=optional,
- org.eclipse.set.model.planpro
+ org.eclipse.set.model.planpro,
+ org.eclipse.jface.text;bundle-version="3.28.0"
diff --git a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/addons/FopAddon.java b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/addons/FopAddon.java
index ffa262a1a1..b739d7bfc5 100644
--- a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/addons/FopAddon.java
+++ b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/addons/FopAddon.java
@@ -9,8 +9,6 @@
package org.eclipse.set.feature.export.addons;
-import jakarta.inject.Inject;
-
import org.apache.fop.image.loader.batik.ImageLoaderFactorySVG;
import org.apache.fop.image.loader.batik.PreloaderSVG;
import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry;
@@ -21,6 +19,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.inject.Inject;
+
/**
* FOP Initialization.
*
@@ -37,10 +37,9 @@ private static void startUpComplete(
@SuppressWarnings("unused") @UIEventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE) final MApplication application) {
// register SVG pre loader
- ImageImplRegistry.getDefaultInstance()
- .registerPreloader(new PreloaderSVG());
- ImageImplRegistry.getDefaultInstance()
- .registerLoaderFactory(new ImageLoaderFactorySVG());
+ final ImageImplRegistry newInstance = ImageImplRegistry.newInstance();
+ newInstance.registerPreloader(new PreloaderSVG());
+ newInstance.registerLoaderFactory(new ImageLoaderFactorySVG());
LOGGER.info("FOP initialized."); //$NON-NLS-1$
// IMPROVE this shouldn't be necessary
diff --git a/java/bundles/org.eclipse.set.feature.overviewplan/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.feature.overviewplan/META-INF/MANIFEST.MF
index 987cee6433..30f628dd2d 100644
--- a/java/bundles/org.eclipse.set.feature.overviewplan/META-INF/MANIFEST.MF
+++ b/java/bundles/org.eclipse.set.feature.overviewplan/META-INF/MANIFEST.MF
@@ -43,7 +43,6 @@ Require-Bundle: org.eclipse.set.model.planpro,
org.eclipse.set.model.siteplan;bundle-version="2.2.0",
com.fasterxml.jackson.core.jackson-core;bundle-version="2.12.6",
com.fasterxml.jackson.core.jackson-databind;bundle-version="2.12.6",
- org.eclipse.osgi.services,
org.eclipse.jface;bundle-version="3.28.0",
org.eclipse.set.browser;bundle-version="2.2.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
diff --git a/java/bundles/org.eclipse.set.feature/feature.xml b/java/bundles/org.eclipse.set.feature/feature.xml
index cf80e7c082..c1194869bd 100644
--- a/java/bundles/org.eclipse.set.feature/feature.xml
+++ b/java/bundles/org.eclipse.set.feature/feature.xml
@@ -47,7 +47,6 @@ http://www.eclipse.org/legal/epl-v20.html
-
@@ -847,10 +846,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.eclipse.osgi"
version="0.0.0"/>
-
-
@@ -1147,10 +1142,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.apache.batik.svggen"
version="0.0.0"/>
-
-
@@ -1179,10 +1170,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="maven.org.apache.xmlbeans.artifact.xmlbeans"
version="0.0.0"/>
-
-
@@ -1191,10 +1178,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="maven.org.dom4j.artifact.dom4j"
version="0.0.0"/>
-
-
@@ -1203,10 +1186,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="slf4j.api"
version="0.0.0"/>
-
-
@@ -1351,10 +1330,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.apache.batik.i18n"
version="0.0.0"/>
-
-
@@ -1395,10 +1370,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.objectweb.asm.tree.analysis"
version="0.0.0"/>
-
-
@@ -1455,4 +1426,36 @@ http://www.eclipse.org/legal/epl-v20.html
id="maven.net.sf.offo.artifact.fop-hyph"
version="0.0.0"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml b/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml
index bc3866b17c..e0883ce35a 100644
--- a/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml
+++ b/java/bundles/org.eclipse.set.i18n.nl_de.feature/feature.xml
@@ -63,7 +63,6 @@
-
diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.ppmodel.extensions/META-INF/MANIFEST.MF
index 0c7d9eecd7..ab35a91a87 100644
--- a/java/bundles/org.eclipse.set.ppmodel.extensions/META-INF/MANIFEST.MF
+++ b/java/bundles/org.eclipse.set.ppmodel.extensions/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.xtend.lib,
org.eclipse.set.model.planpro,
org.eclipse.set.utils,
org.locationtech.proj4j,
- org.eclipse.osgi.services;bundle-version="3.11.200",
slf4j.api;bundle-version="2.0.9"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Import-Package: jakarta.inject;version="1.0.0",
diff --git a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
index dc87033670..2b374be718 100644
--- a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
+++ b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
@@ -3,64 +3,65 @@
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
-
-
-
+
+
@@ -68,24 +69,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -93,15 +112,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF
index a40ac4a5ec..5321b7dd54 100644
--- a/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF
+++ b/java/bundles/org.eclipse.set.swtbot/META-INF/MANIFEST.MF
@@ -17,13 +17,15 @@ Require-Bundle: org.eclipse.swt,
org.eclipse.jface,
org.eclipse.e4.core.contexts,
org.eclipse.e4.ui.model.workbench,
- org.eclipse.osgi.services,
org.eclipse.osgi,
org.eclipse.core.runtime,
org.eclipse.ui,
org.hamcrest.core,
org.eclipse.swtbot.nebula.nattable.finder,
- org.apache.commons.commons-csv
+ org.apache.commons.commons-csv,
+ junit-jupiter-api,
+ junit-jupiter-params,
+ org.junit
Import-Package: jakarta.inject,
org.eclipse.e4.core.di,
org.eclipse.e4.ui.di,
@@ -43,13 +45,6 @@ Import-Package: jakarta.inject,
org.eclipse.set.browser.swt,
org.eclipse.set.utils.table,
org.eclipse.ui,
- org.junit,
- org.junit.jupiter.api,
- org.junit.jupiter.api.extension;version="5.10.1",
- org.junit.jupiter.api.function,
- org.junit.jupiter.params,
- org.junit.jupiter.params.provider,
- org.junit.platform.engine,
org.slf4j
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
diff --git a/java/bundles/org.eclipse.set.swtbot/SWTBot.launch b/java/bundles/org.eclipse.set.swtbot/SWTBot.launch
index b0ee8c0c34..e17108d20f 100644
--- a/java/bundles/org.eclipse.set.swtbot/SWTBot.launch
+++ b/java/bundles/org.eclipse.set.swtbot/SWTBot.launch
@@ -46,7 +46,7 @@
-
+
@@ -86,11 +86,13 @@
+
+
@@ -104,7 +106,6 @@
-
@@ -142,20 +143,21 @@
-
+
+
-
-
+
+
@@ -188,19 +190,15 @@
-
-
-
-
@@ -238,6 +236,8 @@
+
+
@@ -401,22 +401,23 @@
-
+
-
+
-
+
+
@@ -428,24 +429,19 @@
-
+
+
-
+
-
-
-
-
-
-
-
+
@@ -502,6 +498,7 @@
+
@@ -522,7 +519,6 @@
-
@@ -546,6 +542,9 @@
+
+
+
diff --git a/java/bundles/org.eclipse.set.utils.test/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.utils.test/META-INF/MANIFEST.MF
index de14719f3d..0c9d192714 100644
--- a/java/bundles/org.eclipse.set.utils.test/META-INF/MANIFEST.MF
+++ b/java/bundles/org.eclipse.set.utils.test/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 2.5.0.qualifier
Fragment-Host: org.eclipse.set.utils;bundle-version="0.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: Eclipse Signalling Engineering Toolbox
-Require-Bundle: org.hamcrest.core;bundle-version="1.3.0"
-Import-Package: org.junit.jupiter.api;version="5.6.0",
- org.junit.jupiter.api.function;version="5.6.0",
- org.junit.jupiter.params;version="5.6.0",
- org.junit.jupiter.params.provider;version="5.6.0"
+Require-Bundle: org.hamcrest
+Import-Package: org.junit.jupiter.api,
+ org.junit.jupiter.api.function,
+ org.junit.jupiter.params,
+ org.junit.jupiter.params.provider
diff --git a/pom.xml b/pom.xml
index 0f33a5d666..89e29b51b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
pom
- 4.0.11
+ 4.0.13
3.1.4
2.4
1.4.1