Skip to content

Commit 459bbaf

Browse files
sebthomsebthom
committed
fix(deps): upgrade to Eclipse 2025-09 and JDK25
1 parent 05668ec commit 459bbaf

File tree

8 files changed

+57
-53
lines changed

8 files changed

+57
-53
lines changed

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ When submitting a pull request:
3737
- Include tests for any new features or significant changes.
3838
- Reference the relevant issue(s) in your pull request description.
3939

40+
### Source Code Formatting
41+
42+
Before committing your code ensure it is formatted according the [vegardit.com Eclipse formatter rules](https://github.com/vegardit/vegardit-maven-parent/blob/main/src/etc/eclipse-formatter.xml).
43+
44+
IntelliJ users can use the [Eclipse Code Formatter](https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter) plugin to import and use the formatter settings.
45+
4046

4147
## Licensing
4248

‎build.target‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?pde version="3.8"?>
33
<target includeMode="feature" name="Dart4E Studio Build Target">
44

5-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-23"/>
5+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25"/>
66

77
<locations>
88

@@ -12,44 +12,31 @@
1212
</location>
1313

1414
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
15-
<repository location="https://download.eclipse.org/justj/jres/23/updates/release/latest"/>
15+
<repository location="https://download.eclipse.org/justj/jres/25/updates/release/latest"/>
1616
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
1717
</location>
1818

1919
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
20-
<repository location="https://download.eclipse.org/releases/2025-06/"/>
20+
<repository location="https://download.eclipse.org/releases/2025-09/"/>
21+
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
2122
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
2223
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="0.0.0"/>
2324
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
25+
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="0.0.0"/>
26+
<unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
27+
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="0.0.0"/>
2428
<unit id="org.eclipse.mylyn.wikitext.feature.feature.group" version="0.0.0"/>
2529
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
2630
<unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="0.0.0"/>
2731
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
2832
</location>
2933

30-
<!-- workaround to solve since 2025-03:
31-
[ERROR] Cannot resolve dependencies of project org.haxe4e.studio:org.haxe4e.studio.product:eclipse-repository:1.0.0-SNAPSHOT
32-
[ERROR] with context {osgi.os=linux, org.eclipse.update.install.features=true, osgi.arch=x86_64, org.eclipse.update.install.sources=true, osgi.ws=gtk, org.eclipse.justj.buildtime=true}
33-
[ERROR] Software being installed: org.haxe4e.studio 1.0.0.qualifier
34-
[ERROR] Missing requirement: org.haxe4e.studio 1.0.0.qualifier requires 'org.eclipse.equinox.p2.iu; org.eclipse.ecf.core.ssl.feature.feature.group 0.0.0' but it could not be found: See log for details
35-
-->
3634
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
37-
<repository location="https://download.eclipse.org/rt/ecf/latest/site.p2/"/>
38-
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
39-
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
40-
</location>
41-
42-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
43-
<repository location="https://download.eclipse.org/eclipse/updates/4.36/"/>
35+
<repository location="https://download.eclipse.org/eclipse/updates/4.37/"/>
4436
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
4537
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
4638
</location>
4739

48-
<!-- compatible with 2024-03 see https://download.eclipse.org/tools/orbit/downloads
49-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
50-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/>
51-
</location>-->
52-
5340
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
5441
<repository location="https://download.eclipse.org/lsp4e/releases/latest/"/>
5542
<unit id="org.eclipse.lsp4e" version="0.0.0"/>

‎feature/feature.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</license>
2828

2929
<url>
30-
<update label="Dart4E Latest" url="https://raw.githubusercontent.com/dart4e/dart4e-studio/updatesite/"/>
30+
<update label="Dart4E Studio Latest" url="https://raw.githubusercontent.com/dart4e/dart4e-studio/updatesite/"/>
3131
</url>
3232

3333
<requires>
34-
<import plugin="org.eclipse.platform" version="4.36.0" match="greaterOrEqual"/>
34+
<import plugin="org.eclipse.platform" version="4.37.0" match="greaterOrEqual"/>
3535
<import plugin="org.eclipse.core.contenttype"/>
3636
<import plugin="org.eclipse.core.externaltools"/>
3737
<import plugin="org.eclipse.core.filebuffers"/>
@@ -50,9 +50,9 @@
5050
<import plugin="org.eclipse.ui.ide.application"/>
5151
<import plugin="org.eclipse.ui.genericeditor"/>
5252
<import plugin="org.eclipse.ui.workbench.texteditor"/>
53-
<import plugin="org.apache.commons.commons-io" version="2.17.0" match="compatible"/>
54-
<import plugin="org.apache.commons.lang3" version="3.17.0" match="compatible"/>
55-
<import plugin="net.sf.jstuff.core" version="8.1.0" match="compatible"/>
53+
<import plugin="org.apache.commons.commons-io" version="2.20.0" match="compatible"/>
54+
<import plugin="org.apache.commons.lang3" version="3.19.0" match="compatible"/>
55+
<import plugin="net.sf.jstuff.core" version="8.2.0" match="compatible"/>
5656
</requires>
5757

5858
<plugin

‎plugin/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1111
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
1212
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1313
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
14-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
14+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=23
1515
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
16-
org.eclipse.jdt.core.compiler.compliance=17
16+
org.eclipse.jdt.core.compiler.compliance=23
1717
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1818
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1919
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -115,4 +115,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
115115
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
116116
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
117117
org.eclipse.jdt.core.compiler.release=enabled
118-
org.eclipse.jdt.core.compiler.source=17
118+
org.eclipse.jdt.core.compiler.source=23

‎plugin/plugin.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<property name="appName" value="Dart4E Studio"/>
1313
<property
1414
name="aboutText"
15-
value="Dart4E Studio - Eclipse based Dart/Flutter IDE&#x0A;https://github.com/dart4e/dart4e-studio&#x0A;&#x0A;Copyright 2022-2024 by the Dart4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Eclipse Foundation, Inc., https://www.eclipse.org/ and Apache Software Foundation, https://www.apache.org/.">
15+
value="Dart4E Studio - Eclipse based Dart/Flutter IDE&#x0A;https://github.com/dart4e/dart4e-studio&#x0A;&#x0A;Copyright 2022-2025 by the Dart4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Eclipse Foundation, Inc., https://www.eclipse.org/ and Apache Software Foundation, https://www.apache.org/.">
1616
</property>
1717
<property
1818
name="windowImages"

‎pom.xml‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>com.vegardit.maven</groupId>
1515
<artifactId>vegardit-maven-parent</artifactId>
16-
<version>6.1.10</version>
16+
<version>6.1.13</version>
1717
</parent>
1818

1919
<groupId>org.dart4e.studio</groupId>
@@ -66,8 +66,8 @@
6666

6767

6868
<properties>
69-
<java.version>23</java.version>
70-
<tycho.version>4.0.13</tycho.version>
69+
<java.version>25</java.version>
70+
<tycho.version>5.0.0</tycho.version>
7171
<jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>
7272

7373
<!-- to prevent:
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>com.vegardit.no-npe</groupId>
9595
<artifactId>no-npe-eea-all</artifactId>
96-
<version>[1.3.0,)</version>
96+
<version>[1.3.7,)</version>
9797
<scope>provided</scope>
9898
</dependency>
9999
</dependencies>
@@ -117,6 +117,26 @@
117117
</configuration>
118118
</plugin>
119119

120+
<plugin>
121+
<groupId>org.codehaus.gmavenplus</groupId>
122+
<artifactId>gmavenplus-plugin</artifactId>
123+
<dependencies>
124+
<!--
125+
workaround since Tycho 5 where for some unknown reason the Maven build aborts with
126+
org.apache.maven.lifecycle.LifecycleExecutionException:
127+
Failed to execute goal org.codehaus.gmavenplus:gmavenplus-plugin:4.2.1:execute (groovy.script.onValidate@validate) on project org.haxe4e.parent:
128+
Error occurred while calling a method on a Groovy class from classpath.
129+
Caused by: org.codehaus.groovy.control.MultipleCompilationErrorsException: startup failed:
130+
General error during conversion: Error grabbing Grapes [download failed: commons-codec#commons-codec;1.18.0!commons-codec.jar]
131+
at groovy.grape.GrapeIvy.getDependencies(GrapeIvy.groovy:487)
132+
-->
133+
<dependency>
134+
<groupId>commons-codec</groupId>
135+
<artifactId>commons-codec</artifactId>
136+
<version>1.18.0</version>
137+
</dependency>
138+
</dependencies>
139+
</plugin>
120140
<plugin>
121141
<groupId>org.eclipse.tycho</groupId>
122142
<artifactId>tycho-bnd-plugin</artifactId>

‎product/dart4e-studio.product‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Dart4E Studio" uid="org.dart4e.studio" id="org.dart4e.studio.plugin.product" application="org.dart4e.studio.application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
4+
<product name="Dart4E Studio" uid="org.dart4e.studio" id="org.dart4e.studio.plugin.product" application="org.dart4e.studio.application" version="1.0.0.qualifier" type="features" includeLaunchers="true" includeJRE="true" autoIncludeRequirements="true">
55

66
<aboutInfo>
77
<image path="src/main/resources/images/logo/dart4e_logo64x64.png"/>
@@ -338,21 +338,8 @@ version(s), and exceptions or additional permissions here}.&quot;
338338
</plugins>
339339

340340
<features>
341-
<feature id="org.eclipse.e4.rcp"/>
342-
<feature id="org.eclipse.ecf.core.feature"/>
343-
<feature id="org.eclipse.ecf.core.ssl.feature"/>
344-
<feature id="org.eclipse.ecf.filetransfer.feature"/>
345-
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
346-
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
347-
<feature id="org.eclipse.emf.common"/>
348-
<feature id="org.eclipse.emf.ecore"/>
349-
<feature id="org.eclipse.equinox.p2.core.feature"/>
350-
<feature id="org.eclipse.equinox.p2.extras.feature"/>
351-
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
352-
<feature id="org.eclipse.equinox.p2.user.ui"/>
353-
<feature id="org.eclipse.help"/>
354341
<feature id="org.eclipse.platform"/>
355-
<feature id="org.eclipse.rcp"/>
342+
<feature id="org.eclipse.epp.mpc" installMode="root"/>
356343
<feature id="org.eclipse.egit" installMode="root"/>
357344
<feature id="org.eclipse.egit.gitflow.feature" installMode="root"/>
358345
<feature id="org.eclipse.jgit" installMode="root"/>
@@ -384,7 +371,6 @@ version(s), and exceptions or additional permissions here}.&quot;
384371
<feature id="de.sebthom.eclipse.previewer.feature" installMode="root"/>
385372
<feature id="net.certiv.tools.indentguide.feature" installMode="root"/>
386373
</features>
387-
388374
<configurations>
389375
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
390376
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
@@ -394,8 +380,8 @@ version(s), and exceptions or additional permissions here}.&quot;
394380
</configurations>
395381

396382
<repositories>
397-
<repository location="https://raw.githubusercontent.com/dart4e/dart4e-studio/updatesite/" enabled="true" />
398-
<repository location="https://raw.githubusercontent.com/dart4e/dart4e/updatesite/" enabled="true" />
383+
<repository location="https://raw.githubusercontent.com/dart4e/dart4e/updatesite/" name="Dart4E" enabled="true" />
384+
<repository location="https://raw.githubusercontent.com/dart4e/dart4e-studio/updatesite/" name="Dart4E Studio" enabled="true" />
399385
</repositories>
400386

401387
<preferencesInfo>

‎product/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<artifactId>org.dart4e.studio.product</artifactId>
2121
<packaging>eclipse-repository</packaging>
2222

23+
<properties>
24+
<!-- must match the product uid defined in one *.product file in this directory -->
25+
<tycho.product.uid>org.dart4e.studio</tycho.product.uid>
26+
</properties>
27+
2328
<build>
2429
<plugins>
2530
<plugin>
@@ -41,7 +46,7 @@
4146
<configuration>
4247
<products>
4348
<product>
44-
<id>org.dart4e.studio</id>
49+
<id>${tycho.product.uid}</id>
4550
</product>
4651
</products>
4752
<!--<formats>

0 commit comments

Comments
 (0)