more cleanup

Signed-off-by: Christian Dietrich <[email protected]>
eclipse · Dec 17, 2024 · 7d2a050 · 7d2a050
1 parent ebb96e5
commit 7d2a050
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/org.eclipse.xpect.releng/README.md b/org.eclipse.xpect.releng/README.md
@@ -25,11 +25,10 @@ Maven release artifacts are automatically deployed during a release build
 
 ### Update maven version
 
-To select an other target platform use e.g. `-Dtarget-platform=eclipse_2023_03-xtext_2_31_0`
+To select an other target platform use e.g. `-Dtarget-platform=xpect_latest`
 
-```mvn org.eclipse.tycho:tycho-versions-plugin:set-version -Dtarget-platform=eclipse_2023_03-xtext_2_31_0 -P'!xtext-examples' -DnewVersion="0.2.0.v20190619" -Dartifacts="org.eclipse.xpect.parent,org.eclipse.xpect.test.parent"```
+```mvn org.eclipse.tycho:tycho-versions-plugin:set-version -Dtarget-platform=xpect_latest -P'!xtext-examples' -DnewVersion="0.2.0.v20190619" -Dartifacts="org.eclipse.xpect.parent,org.eclipse.xpect.test.parent"```
 
-Manually change the property value of `target-platform-version` to  0.2.0.v20190619 in:
 ```
 org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
 org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml

diff --git a/org.eclipse.xpect.releng/Xpect.setup b/org.eclipse.xpect.releng/Xpect.setup
@@ -250,7 +250,7 @@
           &lt;booleanAttribute key=&quot;M2_OFFLINE&quot; value=&quot;false&quot;/>
           &lt;stringAttribute key=&quot;M2_PROFILES&quot; value=&quot;!promote&quot;/>
           &lt;listAttribute key=&quot;M2_PROPERTIES&quot;>
-              &lt;listEntry value=&quot;target-platform=xpect_r202403.target&quot;/>
+              &lt;listEntry value=&quot;target-platform=xpect_r202403&quot;/>
               &lt;listEntry value=&quot;user.home=$${system_property:user.home}&quot;/>
               &lt;listEntry value=&quot;tycho-version=4.0.10&quot;/>
           &lt;/listAttribute>

diff --git a/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml b/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
@@ -15,10 +15,9 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
+		<target-platform>xpect_r202403</target-platform>
 		<xtextVersion>2.31.0</xtextVersion>
 		<tycho-version>4.0.10</tycho-version>
-		<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 

diff --git a/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml b/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
@@ -21,8 +21,7 @@ Contributors:
 		<os-jvm-flags />
 		<memory-settings>-Xmx1G</memory-settings>
 		<tycho-version>4.0.10</tycho-version>
-		<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
-		<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
+		<target-platform>xpect_r202403</target-platform>
 	</properties>
 
 	<profiles>

diff --git a/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml b/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
@@ -20,8 +20,7 @@ Contributors:
 	<properties>
 		<memory-settings>-Xmx1G</memory-settings>
 		<tycho-version>4.0.10</tycho-version>
-		<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
-		<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
+		<target-platform>xpect_r202403</target-platform>
 	</properties>
 
 	<profiles>
@@ -106,11 +105,9 @@ Contributors:
 							<version>${tycho-version}</version>
 							<configuration>
 								<target>
-									<artifact>
-										<groupId>org.eclipse.xpect</groupId>
-										<artifactId>org.eclipse.xpect.target.${target-platform}</artifactId>
-										<version>${target-platform-version}</version>
-									</artifact>
+									<file>
+										${maven.multiModuleProjectDirectory}/${target-platform}.target
+									</file>
 								</target>
 								<environments>
 									<environment>