Skip to content

Commit

Permalink
Upgrade to Eclipse Tycho 3.0.4
Browse files Browse the repository at this point in the history
The old Tycho version 2.7.5 had to be replaced with the latest Tycho
version 3.0.4 to fulfill Java 17 requirements of third party
dependencies in the Eclipse Platform.

Following the migration guide at [1] this includes removal of the pack
200 post-processing, migration of the Git timestamp provider, and
setting the archive format for Linux back to ZIP.

Also update the Eclipse version and its runtime arguments that are used
for dynamically creating the HTML documentation at runtime of the build.

[1] https://github.com/eclipse-tycho/tycho/blob/tycho-3.0.4/RELEASE_NOTES.md#migration-guide-2x---3x
  • Loading branch information
mknauer committed Apr 13, 2023
1 parent 636ebac commit 122d7f1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 41 deletions.
16 changes: 8 additions & 8 deletions bundles/org.eclipse.rap.doc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<packaging>eclipse-plugin</packaging>

<properties>
<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.17/</eclipserun-repo>
<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.27/</eclipserun-repo>
<runtimeSourceDir>${project.basedir}/../../../org.eclipse.rap</runtimeSourceDir>
</properties>

Expand All @@ -37,15 +37,15 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<applicationsArgs>
<applicationArgs>
<args>-application</args><args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args><args>reference-build/build.xml</args>
<args>-Dversion="${project.version}"</args>
<args>-DbaseDir="${project.basedir}"</args>
<args>-DtargetDir="${project.build.directory}/reference/guide/reference"</args>
<args>-DruntimeSourceDir="${runtimeSourceDir}"</args>
<args>-data</args><args>"${project.build.directory}/workspace"</args>
</applicationsArgs>
<args>-Dversion=${project.version}</args>
<args>-DbaseDir=${project.basedir}</args>
<args>-DtargetDir=${project.build.directory}/reference/guide/reference</args>
<args>-DruntimeSourceDir=${runtimeSourceDir}</args>
<args>-data</args><args>${project.build.directory}/workspace</args>
</applicationArgs>
<dependencies>
<dependency>
<artifactId>org.apache.ant</artifactId>
Expand Down
35 changes: 2 additions & 33 deletions releng/org.eclipse.rap.tools.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<tycho-version>2.7.5</tycho-version>
<tycho-version>3.0.4</tycho-version>
<signing-plugin-version>1.3.2</signing-plugin-version>
<tycho.scmUrl>scm:git:https://github.com/eclipse-rap/org.eclipse.rap.tools</tycho.scmUrl>
<!-- disabled due to bug 393977
Expand Down Expand Up @@ -81,7 +81,7 @@
<version>${tycho-version}</version>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-version}</version>
</dependency>
Expand Down Expand Up @@ -206,23 +206,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>

<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-normalize</id>
<goals>
<goal>normalize</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
Expand All @@ -239,20 +222,6 @@
</executions>
</plugin>

<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
<goals>
<goal>pack</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
Expand Down

0 comments on commit 122d7f1

Please sign in to comment.