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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:
if [[ ${{github.ref}} == "refs/heads/main" || "${{github.ref}}" == refs/tags/* ]]; then
m2RepoPath="set-github::https://maven.pkg.github.com/${{ github.repository }}"
fi
mvn ${{ env.MVN_FLAGS }} -f java/pom.xml deploy checkstyle:checkstyle -DaltDeploymentRepository="$m2RepoPath" -DskipTests
mvn -U ${{ env.MVN_FLAGS }} -f java/pom.xml deploy checkstyle:checkstyle -DaltDeploymentRepository="$m2RepoPath" -DskipTests
env:
GITHUB_TOKEN: ${{ github.token }}

Expand Down
2 changes: 1 addition & 1 deletion BUILD_INSTRUCTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Other operating systems or processor architectures may work, but are generally n
- A Java Development Kit 21
- node.js 22
- Maven (3.9.9)
- Eclipse IDE (2025-03)
- Eclipse IDE (2025-12)
- [hugo](https://gohugo.io/) (v0.101.0+)
- should be available in your $PATH as `hugo`
- [asciidoctor](https://docs.asciidoctor.org/)
Expand Down
4 changes: 0 additions & 4 deletions java/bundles/org.eclipse.set.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1342,10 +1342,6 @@ http://www.eclipse.org/legal/epl-v20.html
id="com.google.guava.failureaccess"
version="0.0.0"/>

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

<plugin
id="org.apache.aries.spifly.dynamic.bundle"
version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,52 @@
<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.80.0"/>
<unit id="bcprov" version="1.80.0"/>
<unit id="bcutil" version="1.80.0"/>
<unit id="bcpg" version="1.82.0"/>
<unit id="bcprov" version="1.82.0"/>
<unit id="bcutil" version="1.82.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="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="com.ibm.icu" version="78.1.0"/>
<unit id="com.sun.jna" version="5.18.1.v20251001-0800"/>
<unit id="com.sun.jna.platform" version="5.18.1"/>
<unit id="ch.qos.logback.classic" version="1.5.21"/>
<unit id="ch.qos.logback.core" version="1.5.21"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
<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.batik.anim" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.awt.util" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.bridge" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.dom" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.dom.svg" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.ext" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.gvt" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.parser" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.script" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.transcoder" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.xml" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.svggen" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.constants" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.util" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.css" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.batik.i18n" version="1.19.0.v20250506-1400"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<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.commons.commons-io" version="2.21.0"/>
<unit id="org.apache.commons.commons-compress" version="1.28.0"/>
<unit id="org.apache.commons.lang3" version="3.20.0"/>
<unit id="org.apache.xalan" version="2.7.2.v20201124-1837"/>
<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.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.27.0.v20250603-1655"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.44.0.v20251106-1447"/>
<unit id="org.eclipse.net4j.util.feature.group" version="4.29.0.v20251117-1051"/>
<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.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.objectweb.asm" version="9.9.0"/>
<unit id="org.objectweb.asm.commons" version="9.9.0"/>
<unit id="org.objectweb.asm.tree" version="9.9.0"/>
<unit id="org.objectweb.asm.tree.analysis" version="9.9.0"/>
<unit id="org.objectweb.asm.util" version="9.9.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"/>
Expand All @@ -61,50 +59,51 @@
<unit id="jakarta.servlet-api" version="6.1.0"/>
<unit id="javax.activation" version="1.2.2.v20221203-1659"/>
<unit id="slf4j.api" version="2.0.17"/>
<repository location="https://download.eclipse.org/releases/2025-06/"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.42.0.v20251025-0946"/>
<repository location="https://download.eclipse.org/releases/2025-12/"/>
</location>

<!-- Needed for Eclipse EMF ECP-->
<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="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="com.github.weisj.jsvg" version="2.0.0"/>
<unit id="junit-jupiter-api" version="5.14.1"/>
<unit id="junit-jupiter-engine" version="5.14.1"/>
<unit id="junit-jupiter-migrationsupport" version="5.14.1"/>
<unit id="junit-jupiter-params" version="5.14.1"/>
<unit id="junit-platform-commons" version="1.14.1"/>
<unit id="junit-platform-engine" version="1.14.1"/>
<unit id="junit-platform-launcher" version="1.14.1"/>
<unit id="junit-platform-runner" version="1.14.1"/>
<unit id="junit-platform-suite-api" version="1.14.1"/>
<unit id="junit-platform-suite-commons" version="1.14.1"/>
<unit id="junit-platform-suite-engine" version="1.14.1"/>
<unit id="junit-vintage-engine" version="5.14.1"/>
<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.sdk.feature.group" version="4.38.0.v20251201-1407"/>
<unit id="org.eclipse.e4.rcp.feature.group" version="4.38.0.v20251126-0427"/>
<unit id="org.eclipse.e4.tools" version="4.11.100.v20251023-1512"/>
<unit id="org.eclipse.e4.tools.emf.ui" version="4.8.900.v20251023-0833"/>
<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.equinox.sdk.feature.group" version="3.23.1900.v20251126-0427"/>
<unit id="org.eclipse.jdt.feature.group" version="3.20.400.v20251201-1407"/>
<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.pde.core" version="3.21.100.v20251118-2241"/>
<unit id="org.eclipse.pde.launching" version="3.13.600.v20251111-0647"/>
<unit id="org.eclipse.pde.ui" version="3.16.300.v20251118-2241"/>
<unit id="org.eclipse.ui.editors" version="3.20.200.v20251125-0939"/>
<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.eclipse.ui.views.log" version="1.4.1000.v20251030-0811"/>
<unit id="org.mockito.mockito-core" version="5.20.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/"/>
<unit id="org.tukaani.xz" version="1.11.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.38/"/>
</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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Bundle-Vendor: Eclipse Signalling Engineering Toolbox
Require-Bundle: org.hamcrest.core,
org.eclipse.emf.ecore,
org.eclipse.set.model.planpro,
junit-platform-commons,
junit-platform-launcher,
junit-platform-runner,
org.mockito.mockito-core
Expand Down
7 changes: 4 additions & 3 deletions java/bundles/org.eclipse.set.utils/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ Require-Bundle: com.google.guava,
org.eclipse.core.databinding.property;bundle-version="1.5.0",
org.eclipse.core.databinding.beans;bundle-version="1.3.0",
org.eclipse.set.rcp.compatibility;resolution:=optional,
org.eclipse.set.model.planpro,
org.eclipse.set.browser,
org.eclipse.set.browser.lib
org.eclipse.set.model.planpro
Bundle-RequiredExecutionEnvironment: JavaSE-21
Import-Package: com.fasterxml.jackson.core,
com.fasterxml.jackson.core.type,
Expand Down Expand Up @@ -129,6 +127,9 @@ Import-Package: com.fasterxml.jackson.core,
org.eclipse.set.basis.part,
org.eclipse.set.basis.text,
org.eclipse.set.basis.viewgroups,
org.eclipse.set.browser,
org.eclipse.set.browser.cef,
org.eclipse.set.browser.swt,
org.eclipse.set.core.services.branding,
org.eclipse.set.core.services.cache,
org.eclipse.set.core.services.configurationservice,
Expand Down
6 changes: 3 additions & 3 deletions releng/eclipse/install_eclipse_plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ if [ ! -f "$ECLIPSE_EXEC" ]; then
exit 1
fi

UPDATE_SITES="https://download.eclipse.org/eclipse/updates/4.35,
https://download.eclipse.org/releases/2025-03,
UPDATE_SITES="https://download.eclipse.org/eclipse/updates/4.38,
https://download.eclipse.org/releases/2025-12,
https://download.eclipse.org/ecoretools/updates/releases/3.5.2/2023-06/,
https://checkstyle.org/eclipse-cs-update-site,
http://download.eclipse.org/ecp/releases/releases_127"
Expand All @@ -36,7 +36,7 @@ PLUGINS="org.eclipse.platform.feature.group,
org.eclipse.m2e.pde.feature.feature.group,
net.sf.eclipsecs.feature.group,
org.eclipse.swtbot.eclipse.feature.group,
org.eclipse.e4.core.tools.feature.source.feature.group,
org.eclipse.e4.core.tools.feature.feature.group,
org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group"

"$ECLIPSE_EXEC" \
Expand Down
10 changes: 5 additions & 5 deletions releng/eclipse/prepare-eclipse.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [ ! -z "$askForInstall" ]; then
if [[ "$OSTYPE" == "linux-gnu" ]]; then
echo "Downloading eclipse for Linux..."
mkdir ./tmp-eclipse-download
curl -o ./tmp-eclipse-download/eclipse.tar.gz https://archive.eclipse.org/technology/epp/downloads/release/2025-03/R/eclipse-java-2025-03-R-linux-gtk-x86_64.tar.gz
curl -o ./tmp-eclipse-download/eclipse.tar.gz https://archive.eclipse.org/technology/epp/downloads/release/2025-12/RC1/eclipse-java-2025-12-RC1-linux-gtk-x86_64.tar.gz
tar -xzf ./tmp-eclipse-download/eclipse.tar.gz --directory ./tmp-eclipse-download --warning=no-unknown-keyword
sleep 5s
mkdir -p $ECLIPSE_HOME
Expand All @@ -52,7 +52,7 @@ if [ ! -z "$askForInstall" ]; then
# Check for macOS (darwin is the OS type identifier used by macOS)
if [[ "$OSTYPE" == "darwin"* ]]; then
echo "Downloading eclipse for macOS..."
curl -o ./eclipse.dmg https://archive.eclipse.org/technology/epp/downloads/release/2025-03/R/eclipse-java-2025-03-R-macosx-cocoa-x86_64.dmg
curl -o ./eclipse.dmg https://archive.eclipse.org/technology/epp/downloads/release/2025-12/RC1/eclipse-java-2025-12-RC1-macosx-cocoa-x86_64.dmg
echo "TODO: How to install eclipse under macos... Please install or unpack the downloaded eclipse.dmg by yourself to $ECLIPSE_HOME and restart the script."
finish 1
fi
Expand All @@ -61,7 +61,7 @@ if [ ! -z "$askForInstall" ]; then
if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || "$OSTYPE" == "win32" ]]; then
echo "Downloading eclipse for Windows..."
mkdir ./tmp-eclipse-download
curl -o ./tmp-eclipse-download/eclipse.zip https://archive.eclipse.org/technology/epp/downloads/release/2025-03/R/eclipse-java-2025-03-R-win32-x86_64.zip
curl -o ./tmp-eclipse-download/eclipse.zip https://archive.eclipse.org/technology/epp/downloads/release/2025-12/RC1/eclipse-java-2025-12-RC1-win32-x86_64.zip
unzip -q ./tmp-eclipse-download/eclipse.zip -d ./tmp-eclipse-download
mkdir -p $ECLIPSE_HOME
mv ./tmp-eclipse-download/eclipse/* $ECLIPSE_HOME
Expand All @@ -70,8 +70,8 @@ if [ ! -z "$askForInstall" ]; then
fi

eclipseBuildId=$(cat $ECLIPSE_HOME/configuration/config.ini | grep eclipse.buildId)
if [ "$eclipseBuildId" != "eclipse.buildId=4.35.0.20250306-0811" ]; then
echo "You are using a different version than the preferred version 2025-03 (4.35) of eclipse: ${eclipseBuildId}."
if [ "$eclipseBuildId" != "eclipse.buildId=4.38.0.20251128-0801" ]; then
echo "You are using a different version than the preferred version 2025-12 (4.38) of eclipse: ${eclipseBuildId}."
echo "You can rerun this script with an nonexisting ECLIPSE_HOME and this script will download the correct version of eclipse for you."
read -p "Do you want to continue with the current eclipse? (y or n) " continue
if [ "$continue" != "y" ]; then
Expand Down
Loading