diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f4e7273d..ab551de26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} diff --git a/BUILD_INSTRUCTIONS.md b/BUILD_INSTRUCTIONS.md index bf9d3e232..fa36f1bff 100644 --- a/BUILD_INSTRUCTIONS.md +++ b/BUILD_INSTRUCTIONS.md @@ -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/) diff --git a/java/bundles/org.eclipse.set.feature/feature.xml b/java/bundles/org.eclipse.set.feature/feature.xml index b66306228..f88dd8460 100644 --- a/java/bundles/org.eclipse.set.feature/feature.xml +++ b/java/bundles/org.eclipse.set.feature/feature.xml @@ -1342,10 +1342,6 @@ http://www.eclipse.org/legal/epl-v20.html id="com.google.guava.failureaccess" version="0.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 17605514d..e16393549 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,54 +3,52 @@ - - - + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - + + - - - - - + + + + + @@ -61,50 +59,51 @@ - + + - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - + + - - - - + + + + - - + + - - + + diff --git a/java/bundles/org.eclipse.set.unittest.utils/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.unittest.utils/META-INF/MANIFEST.MF index 8b25e0e00..209027aa2 100644 --- a/java/bundles/org.eclipse.set.unittest.utils/META-INF/MANIFEST.MF +++ b/java/bundles/org.eclipse.set.unittest.utils/META-INF/MANIFEST.MF @@ -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 diff --git a/java/bundles/org.eclipse.set.utils/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.utils/META-INF/MANIFEST.MF index a4b815cc3..c819a2549 100644 --- a/java/bundles/org.eclipse.set.utils/META-INF/MANIFEST.MF +++ b/java/bundles/org.eclipse.set.utils/META-INF/MANIFEST.MF @@ -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, @@ -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, diff --git a/releng/eclipse/install_eclipse_plugin.sh b/releng/eclipse/install_eclipse_plugin.sh index 1ed5a208b..00e63999b 100755 --- a/releng/eclipse/install_eclipse_plugin.sh +++ b/releng/eclipse/install_eclipse_plugin.sh @@ -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" @@ -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" \ diff --git a/releng/eclipse/prepare-eclipse.sh b/releng/eclipse/prepare-eclipse.sh index 3e098fb36..e472ea6bf 100755 --- a/releng/eclipse/prepare-eclipse.sh +++ b/releng/eclipse/prepare-eclipse.sh @@ -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 @@ -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 @@ -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 @@ -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