Commit 88f0da32 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* updated xtext, mwe, tycho versions, minimum Java is 17, eclipse is 2025-09 

* updates for relocated xtext generator
parent 68047d50

org.etsi.mts.tdl.parent/pom.xml

+5 −5
Original line number Diff line number Diff line
@@ -79,12 +79,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
	</modules>

	

	<properties>

		<maven.compiler.source>11</maven.compiler.source>

		<maven.compiler.target>11</maven.compiler.target>

		<tycho-version>3.0.5</tycho-version>

		<mwe2Version>2.15.0</mwe2Version>

		<maven.compiler.source>17</maven.compiler.source>

		<maven.compiler.target>17</maven.compiler.target>

		<tycho-version>4.0.13</tycho-version>

		<mwe2Version>2.23.0</mwe2Version>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<xtext.version>2.32.0</xtext.version>

		<xtext.version>2.40.0</xtext.version>

		<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>

		<maven.compiler.plugin.version>3.9.0</maven.compiler.plugin.version>

		<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>

org.etsi.mts.tdl.parent/top.target

+12 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?pde version="3.8"?>

<target name="top.target" sequenceNumber="1">

  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>

<locations>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -12,16 +13,16 @@ 
<unit id="com.google.gson" version="0.0.0"/>

<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>

<unit id="org.eclipse.sirius.aql.feature.group" version="0.0.0"/>

<repository location="https://download.eclipse.org/releases/2024-09"/>

<repository location="https://download.eclipse.org/releases/2025-09"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>

<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>

<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.23.0/"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>

<unit id="org.eclipse.xtext.generator" version="0.0.0"/>

<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>

<unit id="org.eclipse.xtext.xtext.generator" version="0.0.0"/>

<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.40.0/"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

<unit id="org.eclipse.epsilon.evl.emf.validation.feature.feature.group" version="0.0.0"/>
@@ -68,5 +69,12 @@ 
		<repository location="https://top.etsi.org/top-extras/updatesite/stable"/>

		<unit id="org.etsi.mts.tdl.extras.feature.feature.group" version="0.0.0"/>

	</location>

    <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

      <!--

        Just mention the p2 repo so that additional requirements with ranges specified in

        features and bundles are taken from Orbit (e.g., objectweb.asm)

      -->

      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-09"/>

    </location>

</locations>

</target>

plugins/org.etsi.mts.tdl.TDLan2/build.properties

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ additional.bundles = org.eclipse.xtext.xbase,\ 
                     org.apache.commons.logging,\

                     org.apache.log4j,\

                     com.ibm.icu,\

                     org.eclipse.xtext.generator
 
                     org.eclipse.xtext.xtext.generator

plugins/org.etsi.mts.tdl.TPLan2/build.properties

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ additional.bundles = org.eclipse.xtext.xbase,\ 
                     org.apache.commons.logging,\

                     org.apache.log4j,\

                     com.ibm.icu,\

                     org.eclipse.xtext.generator
 
                     org.eclipse.xtext.xtext.generator

plugins/org.etsi.mts.tdl.graphical.labels.data/build.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ source.. = src/,\ 
bin.includes = META-INF/,\

               .

additional.bundles = org.eclipse.xtext.xbase,\

                     org.eclipse.xtext.generator,\

                     org.eclipse.xtext.xtext.generator,\

                     org.apache.commons.logging,\

                     org.eclipse.emf.codegen.ecore,\

                     org.eclipse.emf.mwe.utils,\