Skip to content

[Build] Update to Tycho 5.0.2 #3602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdietrich merged 1 commit into from
Mar 12, 2026
Merged

[Build] Update to Tycho 5.0.2 #3602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions org.eclipse.xtend.maven.archetype/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<extraArtifact>org.eclipse.xtext:xtext-dev-bom:${project.version}:pom</extraArtifact>
</extraArtifacts>
<localRepositoryPath>${localMavenRepositoryPath}</localRepositoryPath>
<scope>provided</scope>
</configuration>
<executions>
<execution>
Expand All @@ -74,9 +75,6 @@
<goals>
<goal>install</goal>
</goals>
<configuration>
<scope>test</scope>
</configuration>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -105,7 +103,7 @@
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<scope>provided</scope>
</dependency>
</dependencies>
<profiles>
Expand Down
5 changes: 5 additions & 0 deletions org.eclipse.xtend.tycho.tests.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@
<include>**/*Test?.java</include>
</includes>
<appArgLine>-pluginCustomization ${basedir}/../releng/org.eclipse.xtend.tycho.tests.parent/pluginCustomization.ini</appArgLine>
<!-- Tycho 5.0 defaults to JUnitPlatformProvider, which causes a classloader
conflict: TestEngine.class from the OSGi bundle classloader vs
JupiterTestEngine found via ServiceLoader on the flat JVM classpath.
These test bundles use JUnit 4 only — force the JUnit 4 provider. -->
<useJUnitPlatform>false</useJUnitPlatform>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down
2 changes: 1 addition & 1 deletion ...e.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down
2 changes: 1 addition & 1 deletion ...t.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down
2 changes: 1 addition & 1 deletion ...xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down
2 changes: 1 addition & 1 deletion ...eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down
2 changes: 1 addition & 1 deletion ...e.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down
6 changes: 3 additions & 3 deletions ...ext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- although this example and the Xtext dependencies work and compile with
Java 8 you need to execute the Maven build with Java 11 as parts of Eclipse
2020-09+ require Java 11 -->
Java 17 you need to execute the Maven build with Java 21 as parts of Eclipse
2024-03+ require Java 17 and Tycho requires Java 21. -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>
<targetplatform.groupId>${project.groupId}</targetplatform.groupId>
<targetplatform.artifactId>${project.groupId}.tp</targetplatform.artifactId>
<targetplatform.version>${project.version}</targetplatform.version>
Expand Down
2 changes: 1 addition & 1 deletion ...lipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}

def String getTychoVersion() {
'4.0.13'
'5.0.2'
}

def private CharSequence loadResource(String resourcePath) {
Expand Down
2 changes: 1 addition & 1 deletion ....xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public String getJavaVersion() {
}

public String getTychoVersion() {
return "4.0.13";
return "5.0.2";
}

private CharSequence loadResource(final String resourcePath) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@

<properties>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.2</tycho-version>

<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
Expand Down
Loading