Skip to content

Commit 92acb6c

Browse files
ujhelyizujhelyiz
committed
ST6RI-844 Dependency updates
 - Updated Eclipse requirement to SimRel 2025-03 - Xpect had to be updated to a recent nightly build because of a removal of a test bundle from recent Xtext version - Updated used Asciidoctor version
1 parent 509efa4 commit 92acb6c

6 files changed

Lines changed: 40 additions & 33 deletions

File tree

‎org.omg.sysml.installer/SysML2.setup‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
label="SysML2">
1717
<setupTask
1818
xsi:type="jdt:JRETask"
19-
version="JavaSE-17"
20-
location="${jre.location-17}"
21-
name="JRE for JavaSE-17">
19+
version="JavaSE-21"
20+
location="${jre.location-21}"
21+
name="JRE for JavaSE-21">
2222
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
2323
</setupTask>
2424
<setupTask
@@ -42,10 +42,12 @@
4242
name="net.sourceforge.plantuml.ecore.feature.feature.group"/>
4343
<requirement
4444
name="org.eclipse.m2e.feature.feature.group"/>
45+
<requirement
46+
name="org.eclipse.m2e.pde.feature.feature.group"/>
4547
<repository
46-
url="http://download.eclipse.org/releases/2024-03/"/>
48+
url="http://download.eclipse.org/releases/2025-03/"/>
4749
<repository
48-
url="https://download.eclipse.org/xpect/updates/milestone/S202310150731"/>
50+
url="https://download.eclipse.org/xpect/updates/nightly/N202505300357"/>
4951
<repository
5052
url="https://github.com/himi/p2-update-puml-sysmlv2/raw/main/updates"/>
5153
<description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
@@ -81,7 +83,7 @@
8183
</setupTask>
8284
<setupTask
8385
xsi:type="pde:TargetPlatformTask"
84-
name="SysMLv2 2024-03 Target"/>
86+
name="SysMLv2 2025-03 Target"/>
8587
<stream name="master"
8688
label="Master"/>
8789
<logicalProjectContainer

‎org.omg.sysml.jupyter.installer/pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@
101101
-->
102102
<resource>
103103
<directory>.</directory>
104-
<exclude>**/**</exclude>
104+
<excludes>
105+
<exclude>**/**</exclude>
106+
</excludes>
105107
</resource>
106108
</resources>
107109
</configuration>

‎org.omg.sysml.jupyter.kernel/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.code.gson</groupId>
4444
<artifactId>gson</artifactId>
45-
<version>2.10</version>
45+
<version>2.12.1</version>
4646
<scope>provided</scope>
4747
</dependency>
4848
<dependency>
@@ -95,7 +95,9 @@
9595
-->
9696
<resource>
9797
<directory>.</directory>
98-
<exclude>**/**</exclude>
98+
<excludes>
99+
<exclude>**/**</exclude>
100+
</excludes>
99101
</resource>
100102
</resources>
101103
</configuration>

‎org.omg.sysml.site/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<artifactId>org.omg.sysml.parent</artifactId>
88
<version>${revision}</version>
99
</parent>
10-
<groupId>org.omg.sysml</groupId>
1110
<artifactId>org.omg.sysml.site</artifactId>
1211

1312
<packaging>eclipse-repository</packaging>
@@ -36,7 +35,9 @@
3635
-->
3736
<resource>
3837
<directory>.</directory>
39-
<exclude>**/**</exclude>
38+
<excludes>
39+
<exclude>**/**</exclude>
40+
</excludes>
4041
</resource>
4142
</resources>
4243
</configuration>

‎org.omg.sysml.target/org.omg.sysml.target.target‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target includeMode="feature" name="SysMLv2 2024-03 Target">
3+
<target includeMode="feature" name="SysMLv2 2025-03 Target">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<repository location="https://download.eclipse.org/releases/2024-03/"/>
7-
<unit id="org.eclipse.platform.feature.group" version="4.31.0.v20240229-1022"/>
8-
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.34.0.v20240227-0940"/>
9-
<unit id="org.eclipse.m2m.qvt.oml.runtime.feature.group" version="3.10.8.v20231126-0839"/>
10-
<unit id="org.eclipse.emf.ecore.feature.group" version="2.37.0.v20240203-0859"/>
6+
<repository location="https://download.eclipse.org/releases/2025-03/"/>
7+
<unit id="org.eclipse.platform.feature.group" version="4.35.0.v20250228-0640"/>
8+
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.38.0.v20250226-0658"/>
9+
<unit id="org.eclipse.m2m.qvt.oml.runtime.feature.group" version="3.11.0.v20240902-1403"/>
10+
<unit id="org.eclipse.emf.ecore.feature.group" version="2.39.0.v20241018-1213"/>
1111
<unit id="org.eclipse.uml2.feature.group" version="5.5.3.v20221116-1811"/>
12-
<unit id="org.eclipse.egit.feature.group" version="6.9.0.202403050737-r"/>
13-
<unit id="org.eclipse.jgit.feature.group" version="6.9.0.202403050737-r"/>
14-
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
12+
<unit id="org.eclipse.egit.feature.group" version="7.2.0.202503040940-r"/>
13+
<unit id="org.eclipse.jgit.feature.group" version="7.2.0.202503040940-r"/>
14+
<unit id="com.google.gson" version="2.12.1"/>
1515
</location>
1616
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
1717
<repository location="https://github.com/himi/p2-update-puml-sysmlv2/raw/main/updates"/>
1818
<unit id="net.sourceforge.plantuml.ecore.feature.feature.group" version="1.1.25.202211040339"/>
1919
<unit id="net.sourceforge.plantuml.feature.feature.group" version="1.1.25.202211040339"/>
2020
</location>
2121
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
22-
<repository location="https://download.eclipse.org/xpect/updates/milestone/S202310150731"/>
23-
<unit id="org.eclipse.xpect.sdk.feature.group" version="0.3.0.202310150731"/>
24-
<unit id="org.eclipse.xpect.xtext.lib.feature.feature.group" version="0.3.0.202310150731"/>
25-
<unit id="org.eclipse.xpect.xtext.xbase.lib.feature.feature.group" version="0.3.0.202310150731"/>
22+
<repository location="https://download.eclipse.org/xpect/updates/nightly/N202505300357"/>
23+
<unit id="org.eclipse.xpect.sdk.feature.group" version="0.3.0.202505300357"/>
24+
<unit id="org.eclipse.xpect.xtext.lib.feature.feature.group" version="0.3.0.202505300357"/>
25+
<unit id="org.eclipse.xpect.xtext.xbase.lib.feature.feature.group" version="0.3.0.202505300357"/>
2626
</location>
2727
</locations>
28-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/temurin-17.0.10"/>
28+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
2929
</target>

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<properties>
77
<revision>0.50.0-SNAPSHOT</revision>
8-
<tycho-version>4.0.7</tycho-version>
8+
<tycho-version>4.0.13</tycho-version>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1010
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
1111
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
@@ -21,15 +21,13 @@
2121
<frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
2222
<node.version>16.20.2</node.version>
2323
<yarn.version>1.22.19</yarn.version>
24-
<maven.compiler.target>17</maven.compiler.target>
25-
<maven.compiler.source>17</maven.compiler.source>
26-
<xtext.version>2.34.0</xtext.version>
27-
<junit.version>3.0.0-M7</junit.version>
28-
<asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
29-
<asciidoctorj.pdf.version>1.6.0</asciidoctorj.pdf.version>
3024
<java.version>21</java.version>
3125
<maven.compiler.target>${java.version}</maven.compiler.target>
3226
<maven.compiler.source>${java.version}</maven.compiler.source>
27+
<xtext.version>2.38.0</xtext.version>
28+
<junit.version>3.5.3</junit.version>
29+
<asciidoctor.maven.plugin.version>3.2.0</asciidoctor.maven.plugin.version>
30+
<asciidoctorj.pdf.version>2.3.19</asciidoctorj.pdf.version>
3331
</properties>
3432

3533
<modelVersion>4.0.0</modelVersion>
@@ -269,7 +267,9 @@
269267
-->
270268
<resource>
271269
<directory>.</directory>
272-
<exclude>**/**</exclude>
270+
<excludes>
271+
<exclude>**/**</exclude>
272+
</excludes>
273273
</resource>
274274
</resources>
275275
</configuration>

0 commit comments

Comments
 (0)