Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java/bundles/org.eclipse.set.basis/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -21,6 +19,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.inject.Inject;

/**
* FOP Initialization.
*
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
61 changes: 32 additions & 29 deletions java/bundles/org.eclipse.set.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ http://www.eclipse.org/legal/epl-v20.html
<import plugin="org.eclipse.jface" version="3.10.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.databinding" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.nebula.widgets.nattable.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.swt" version="3.103.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.106.0" match="greaterOrEqual"/>
Expand Down Expand Up @@ -847,10 +846,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.eclipse.osgi"
version="0.0.0"/>

<plugin
id="org.eclipse.osgi.services"
version="0.0.0"/>

<plugin
id="org.eclipse.swt"
version="0.0.0"/>
Expand Down Expand Up @@ -1147,10 +1142,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.apache.batik.svggen"
version="0.0.0"/>

<plugin
id="jakarta.xml.bind"
version="0.0.0"/>

<plugin
id="maven.org.apache.xmlgraphics.artifact.fop"
version="0.0.0"/>
Expand Down Expand Up @@ -1179,10 +1170,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="maven.org.apache.xmlbeans.artifact.xmlbeans"
version="0.0.0"/>

<plugin
id="bcpg"
version="0.0.0"/>

<plugin
id="bcprov"
version="0.0.0"/>
Expand All @@ -1191,10 +1178,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="maven.org.dom4j.artifact.dom4j"
version="0.0.0"/>

<plugin
id="javax.xml"
version="0.0.0"/>

<plugin
id="org.eclipse.set.feature.table.pt1"
version="0.0.0"/>
Expand All @@ -1203,10 +1186,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="slf4j.api"
version="0.0.0"/>

<plugin
id="org.apache.commons.logging"
version="0.0.0"/>

<plugin
id="org.apache.logging.log4j.api"
version="0.0.0"/>
Expand Down Expand Up @@ -1351,10 +1330,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.apache.batik.i18n"
version="0.0.0"/>

<plugin
id="org.apache.commons.jxpath"
version="0.0.0"/>

<plugin
id="javax.inject"
version="0.0.0"/>
Expand Down Expand Up @@ -1395,10 +1370,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="org.objectweb.asm.tree.analysis"
version="0.0.0"/>

<plugin
id="org.apache.commons.collections4"
version="0.0.0"/>

<plugin
id="org.apache.xalan"
version="0.0.0"/>
Expand Down Expand Up @@ -1455,4 +1426,36 @@ http://www.eclipse.org/legal/epl-v20.html
id="maven.net.sf.offo.artifact.fop-hyph"
version="0.0.0"/>

<plugin
id="org.apache.commons.commons-collections4"
version="0.0.0"/>

<plugin
id="org.apache.xmlgraphics"
version="0.0.0"/>

<plugin
id="org.osgi.service.coordinator"
version="0.0.0"/>

<plugin
id="com.github.weisj.jsvg"
version="0.0.0"/>

<plugin
id="org.osgi.service.component"
version="0.0.0"/>

<plugin
id="org.osgi.service.component.annotations"
version="0.0.0"/>

<plugin
id="bcpg"
version="0.0.0"/>

<plugin
id="bcutil"
version="0.0.0"/>

</feature>
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<import plugin="org.eclipse.jface"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="org.eclipse.osgi.util"/>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.text"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,105 +3,124 @@
<target name="org.eclipse.set.releng.target" sequenceNumber="1660124027">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="bcpg" version="1.77.0"/>
<unit id="bcprov" version="1.77.0"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="bcpg" version="1.80.0"/>
<unit id="bcprov" version="1.80.0"/>
<unit id="bcutil" version="1.80.0"/>
<unit id="com.google.guava.failureaccess" version="1.0.3"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="com.google.inject.assistedinject" version="7.0.0"/>
<unit id="com.ibm.icu" version="74.1.0"/>
<unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>
<unit id="com.sun.jna.platform" version="5.13.0"/>
<unit id="ch.qos.logback.classic" version="1.4.11"/>
<unit id="ch.qos.logback.core" version="1.4.11"/>
<unit id="com.ibm.icu" version="77.1.0"/>
<unit id="com.sun.jna" version="5.17.0.v20250316-1700"/>
<unit id="com.sun.jna.platform" version="5.17.0"/>
<unit id="ch.qos.logback.classic" version="1.5.18"/>
<unit id="ch.qos.logback.core" version="1.5.18"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
<unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.awt.util" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.bridge" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.ext" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.gvt" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.parser" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.script" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.transcoder" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.svggen" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.constants" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.util" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.css" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.i18n" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.anim" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.awt.util" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.bridge" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.dom" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.dom.svg" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.ext" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.gvt" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.parser" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.script" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.transcoder" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.xml" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.svggen" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.constants" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.util" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.css" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.batik.i18n" version="1.18.0.v20241009-1200"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.collections4" version="4.4.0.v20221112-0806"/>
<unit id="org.apache.commons.commons-io" version="2.15.0"/>
<unit id="org.apache.commons.commons-compress" version="1.25.0"/>
<unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
<unit id="org.apache.commons.lang3" version="3.13.0"/>
<unit id="org.apache.commons.commons-collections4" version="4.5.0"/>
<unit id="org.apache.commons.commons-io" version="2.19.0"/>
<unit id="org.apache.commons.commons-compress" version="1.27.1"/>
<unit id="org.apache.commons.lang3" version="3.17.0"/>
<unit id="org.apache.xalan" version="2.7.2.v20230928-1302"/>
<unit id="org.apache.xerces" version="2.12.2.v20230928-1306"/>
<unit id="org.apache.xml.resolver" version="1.2.0.v20230928-1222"/>
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.42.0.v20250415-0852"/>
<unit id="org.eclipse.fx.osgi" version="3.9.0.202210162353"/>
<unit id="org.eclipse.net4j.util.feature.group" version="4.22.0.v20231129-1234"/>
<unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.eclipse.net4j.util.feature.group" version="4.27.0.v20250603-1655"/>
<unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20240917-0534"/>
<unit id="org.hamcrest" version="3.0.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm.commons" version="9.6.0"/>
<unit id="org.objectweb.asm.tree" version="9.6.0"/>
<unit id="org.objectweb.asm.tree.analysis" version="9.6.0"/>
<unit id="org.objectweb.asm.util" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.8.0"/>
<unit id="org.objectweb.asm.commons" version="9.8.0"/>
<unit id="org.objectweb.asm.tree" version="9.8.0"/>
<unit id="org.objectweb.asm.tree.analysis" version="9.8.0"/>
<unit id="org.objectweb.asm.util" version="9.8.0"/>
<unit id="org.osgi.service.prefs" version="1.1.2.202109301733"/>
<unit id="org.osgi.service.coordinator" version="1.0.2.201505202024" />
<unit id="org.osgi.service.component" version="1.5.1.202212101352"/>
<unit id="org.osgi.service.component.annotations" version="1.5.1.202212101352"/>
<unit id="jakarta.annotation-api" version="2.1.1"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="jakarta.transaction-api" version="1.3.3"/>
<unit id="jakarta.servlet-api" version="6.0.0"/>
<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
<unit id="jakarta.servlet-api" version="6.1.0"/>
<unit id="javax.activation" version="1.2.2.v20221203-1659"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="slf4j.api" version="2.0.9"/>
<repository location="https://download.eclipse.org/releases/2023-12/"/>
<unit id="slf4j.api" version="2.0.17"/>
<repository location="https://download.eclipse.org/releases/2025-06/"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="javax.inject" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2023-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/>
<unit id="org.eclipse.e4.rcp.feature.group" version="4.30.0.v20231113-1355"/>
<unit id="org.eclipse.e4.tools" version="4.10.200.v20231106-1600"/>
<unit id="org.eclipse.e4.tools.emf.ui" version="4.8.200.v20231106-1600"/>
<unit id="org.eclipse.e4.tools.services" version="4.10.300.v20231030-2045"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.36.0.v20231002-1156"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1000.v20231114-0937"/>
<unit id="org.eclipse.jdt.feature.group" version="3.19.300.v20231201-0110"/>
<unit id="org.eclipse.pde.build" version="3.12.200.v20231108-1957"/>
<unit id="org.eclipse.pde.core" version="3.17.200.v20231118-2008"/>
<unit id="org.eclipse.pde.launching" version="3.11.200.v20231108-1957"/>
<unit id="org.eclipse.pde.ui" version="3.15.0.v20231118-2008"/>
<unit id="org.eclipse.ui.editors" version="3.17.100.v20231106-1600"/>
<unit id="org.eclipse.ui.trace" version="1.3.200.v20230913-0603"/>
<unit id="org.eclipse.ui.views.log" version="1.4.200.v20231025-1102"/>
<unit id="org.mockito.mockito-core" version="5.7.0"/>
<unit id="org.objenesis" version="3.3.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.30/"/>
<unit id="com.github.weisj.jsvg" version="1.7.2"/>
<unit id="junit-jupiter-api" version="5.12.2"/>
<unit id="junit-jupiter-engine" version="5.12.2"/>
<unit id="junit-jupiter-migrationsupport" version="5.12.2"/>
<unit id="junit-jupiter-params" version="5.12.2"/>
<unit id="junit-platform-commons" version="1.12.2"/>
<unit id="junit-platform-engine" version="1.12.2"/>
<unit id="junit-platform-launcher" version="1.12.2"/>
<unit id="junit-platform-runner" version="1.12.2"/>
<unit id="junit-platform-suite-api" version="1.12.2"/>
<unit id="junit-platform-suite-commons" version="1.12.2"/>
<unit id="junit-platform-suite-engine" version="1.12.2"/>
<unit id="junit-vintage-engine" version="5.12.2"/>
<unit id="org.apiguardian.api" version="1.1.2"/>
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
<unit id="org.opentest4j" version="1.3.0"/>
<unit id="org.apache.xmlgraphics" version="2.11.0.v20250506-1400"/>
<unit id="org.eclipse.sdk.feature.group" version="4.36.0.v20250528-2229"/>
<unit id="org.eclipse.e4.rcp.feature.group" version="4.36.0.v20250528-1759"/>
<unit id="org.eclipse.e4.tools" version="4.11.0.v20250110-2205"/>
<unit id="org.eclipse.e4.tools.emf.ui" version="4.8.700.v20250415-1756"/>
<unit id="org.eclipse.e4.tools.services" version="4.10.600.v20240801-2123"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.40.0.v20250414-1351"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1700.v20250526-2018"/>
<unit id="org.eclipse.jdt.feature.group" version="3.20.200.v20250528-1830"/>
<unit id="org.eclipse.pde.build" version="3.12.800.v20250515-0456"/>
<unit id="org.eclipse.pde.core" version="3.20.200.v20250506-0418"/>
<unit id="org.eclipse.pde.launching" version="3.13.400.v20250513-0835"/>
<unit id="org.eclipse.pde.ui" version="3.16.100.v20250527-1209"/>
<unit id="org.eclipse.ui.editors" version="3.20.0.v20250514-1719"/>
<unit id="org.eclipse.ui.trace" version="1.3.500.v20250320-0611"/>
<unit id="org.eclipse.ui.views.log" version="1.4.800.v20250426-1716"/>
<unit id="org.mockito.mockito-core" version="5.18.0"/>
<unit id="org.objenesis" version="3.4.0"/>
<unit id="org.tukaani.xz" version="1.10.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.36/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/technology/babel/update-site/R0.20.0/2022-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtend.lib" version="2.38.0.v20250226-0658"/>
<unit id="org.eclipse.xtend.lib.macro" version="2.38.0.v20250226-0658"/>
<unit id="org.eclipse.xtend.lib.macro.source" version="2.38.0.v20250226-0658"/>
<unit id="org.eclipse.xtend.lib.source" version="2.38.0.v20250226-0658"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.38.0.v20250226-0658"/>
<unit id="org.eclipse.xtext.xbase.lib" version="2.38.0.v20250226-0658"/>
<unit id="org.eclipse.xtext.xbase.lib.source" version="2.38.0.v20250226-0658"/>
<unit id="com.google.guava" version="33.4.0.jre"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.38.0/"/>
<unit id="org.eclipse.xtend.lib" version="2.39.0.v20250527-0725"/>
<unit id="org.eclipse.xtend.lib.macro" version="2.39.0.v20250527-0725"/>
<unit id="org.eclipse.xtend.lib.macro.source" version="2.39.0.v20250527-0725"/>
<unit id="org.eclipse.xtend.lib.source" version="2.39.0.v20250527-0725"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.39.0.v20250527-0725"/>
<unit id="org.eclipse.xtext.xbase.lib" version="2.39.0.v20250527-0725"/>
<unit id="org.eclipse.xtext.xbase.lib.source" version="2.39.0.v20250527-0725"/>
<unit id="com.google.guava" version="33.4.8.jre"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.39.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="2.2.0.202306301103"/>
Expand Down
Loading
Loading