Skip to content

Commit a782670

Browse files
committed
Update to more recent Tycho
To be able to use location type Maven in target file we need a more recent Tycho version. Instead of updating to latest (5.x) version of Tycho, we limit to 3.x version so that we can maintain compatibility with older Eclipse target platform. Embed CDT uses 2020-09 as target platform. The build requires a newer Java version, but the built artifacts continue to run in Java11+ on Eclipse 2020-09+. Fixes #646
1 parent fd1f204 commit a782670

5 files changed

Lines changed: 22 additions & 58 deletions

File tree

.mvn/extensions.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
-->
1515
<extensions>
1616
<extension>
17-
<groupId>org.eclipse.tycho.extras</groupId>
18-
<artifactId>tycho-pomless</artifactId>
19-
<version>1.7.0</version>
17+
<groupId>org.eclipse.tycho</groupId>
18+
<artifactId>tycho-build</artifactId>
19+
<version>3.0.5</version>
2020
</extension>
2121
</extensions>

README-MAINTAINER.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ git clone --recurse-submodule https://github.com/eclipse-embed-cdt/eclipse-plugi
1717

1818
Production builds are run via
1919
[Jenkins](https://ci.eclipse.org/embed-cdt/)
20-
on the Eclipse Foundation infrastructure (CBI); for local builds, use the
21-
[Adopt OpenJDK 11](https://adoptopenjdk.net) and maven 3.6.
20+
on the Eclipse Foundation infrastructure (CBI); for local builds, use
21+
[Java 21](https://adoptium.net) and [Maven 3.9](https://maven.apache.org/).
2222

2323
## Development workflow
2424

parent/pom.xml

Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<modelVersion>4.0.0</modelVersion>
2020

2121
<prerequisites>
22-
<maven>3.6.3</maven>
22+
<maven>3.9.11</maven>
2323
</prerequisites>
2424

2525
<!-- https://maven.apache.org/pom.html groupId:artifactId:version are all
@@ -32,8 +32,8 @@
3232
<packaging>pom</packaging>
3333

3434
<properties>
35-
<!-- https://wiki.eclipse.org/Tycho/Release_Notes -->
36-
<tycho.version>1.7.0</tycho.version>
35+
<!-- https://github.com/eclipse-tycho/tycho/blob/main/RELEASE_NOTES.md -->
36+
<tycho.version>3.0.5</tycho.version>
3737

3838
<!-- Silence a Maven warning -->
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,7 +42,7 @@
4242
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
4343

4444
<!-- Eclipse provided plug-ins for signing JARs with Eclipse infra -->
45-
<cbi-plugins.version>1.3.1</cbi-plugins.version>
45+
<cbi-plugins.version>1.5.2</cbi-plugins.version>
4646

4747
<semverVersion>6.6.1</semverVersion>
4848

@@ -104,7 +104,6 @@
104104
<artifactId>target-platform-configuration</artifactId>
105105
<version>${tycho.version}</version>
106106
<configuration>
107-
<resolver>p2</resolver>
108107
<pomDependencies>consider</pomDependencies>
109108

110109
<!-- Mandatory, without it Build is platform dependent. -->
@@ -154,35 +153,17 @@
154153
</configuration>
155154
<executions>
156155
<execution>
157-
<id>attach-source</id>
156+
<id>plugin-source</id>
158157
<goals>
159158
<goal>plugin-source</goal>
160159
</goals>
161160
</execution>
162-
</executions>
163-
</plugin>
164-
<plugin>
165-
<groupId>org.eclipse.tycho.extras</groupId>
166-
<artifactId>tycho-source-feature-plugin</artifactId>
167-
<version>${tycho.version}</version>
168-
<configuration>
169-
<archive>
170-
<addMavenDescriptor>false</addMavenDescriptor>
171-
</archive>
172-
<reuseBrandingPlugin>false</reuseBrandingPlugin>
173-
</configuration>
174-
<executions>
175161
<execution>
176-
<id>source-feature</id>
162+
<id>feature-source</id>
177163
<phase>package</phase>
178164
<goals>
179-
<goal>source-feature</goal>
165+
<goal>feature-source</goal>
180166
</goals>
181-
<configuration>
182-
<excludes>
183-
<plugin id="org.eclipse.embedcdt.doc.user" />
184-
</excludes>
185-
</configuration>
186167
</execution>
187168
</executions>
188169
</plugin>
@@ -263,30 +244,6 @@
263244
</pluginManagement>
264245
</build>
265246
<profiles>
266-
<!-- Automatic profile for features that shouldn't generate sources -->
267-
<profile>
268-
<id>feature-no-source</id>
269-
<activation>
270-
<file>
271-
<exists>feature-no-source.properties</exists>
272-
</file>
273-
</activation>
274-
<build>
275-
<plugins>
276-
<plugin>
277-
<groupId>org.eclipse.tycho.extras</groupId>
278-
<artifactId>tycho-source-feature-plugin</artifactId>
279-
<version>${tycho.version}</version>
280-
<executions>
281-
<execution>
282-
<id>source-feature</id>
283-
<phase>none</phase>
284-
</execution>
285-
</executions>
286-
</plugin>
287-
</plugins>
288-
</build>
289-
</profile>
290247
<profile>
291248
<id>production</id>
292249
<build>

scripts/jenkins/builds.Jenkinsfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@ pipeline {
55
}
66
}
77
tools {
8+
// https://github.com/eclipse-cbi/jiro/wiki/Tools-(JDK,-Maven,-Ant)#apache-maven
9+
// https://eclipse.dev/cbi/jiro/Tools/#apache-maven
810
maven 'apache-maven-latest'
9-
jdk 'adoptopenjdk-hotspot-jdk11-latest'
11+
12+
// https://github.com/eclipse-cbi/jiro/wiki/Tools-(JDK,-Maven,-Ant)#eclipse-temurin
13+
// https://eclipse.dev/cbi/jiro/Tools/#eclipse-temurin
14+
jdk 'temurin-jdk21-latest'
1015
}
16+
1117
stages {
1218
stage('Build') {
1319
steps {

target-platform/org.eclipse.embedcdt.target-platform.target

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@
4646
</location>
4747
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
4848
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest/"/>
49-
<unit id="org.antlr.runtime" version="[3.5,4.0)"/>
49+
<unit id="org.antlr.runtime" version="3.5.3.v20230929-1400"/> <!-- To use version ranges needs more recent tycho: [3.5.0,4.0.0) -->
5050
</location>
5151
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
5252
<repository location="http://download.eclipse.org/cbi/updates/license/"/>
5353
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
5454
</location>
5555
</locations>
56-
</target>
56+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
57+
</target>

0 commit comments

Comments
 (0)