1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Upgrade to Tycho 3.0.3 (latest)

Part of #320
See also #308
This commit is contained in:
Jonah Graham 2023-03-13 14:25:58 -04:00
parent 8940a9b331
commit c18d06e84d
10 changed files with 44 additions and 29 deletions

View file

@ -31,10 +31,6 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Setup Maven
uses: stCarolas/setup-maven@v.4.5
with:
maven-version: 3.8.7
- name: Install GCC & GDB & other build essentials
run: |
sudo apt-get -y install build-essential gcc g++ gdb gdbserver

View file

@ -21,10 +21,6 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Setup Maven
uses: stCarolas/setup-maven@v.4.5
with:
maven-version: 3.8.7
- name: Install dependencies
run: |
sudo apt-get update && sudo apt-get install -y --no-install-recommends \

View file

@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.1</version>
<version>3.0.3</version>
</extension>
</extensions>

View file

@ -59,7 +59,13 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
<applicationArgs>
<arg>-application</arg>
<arg>org.eclipse.ant.core.antRunner</arg>
<arg>-buildfile</arg>
<arg>build-index.xml</arg>
<arg>build.index</arg>
</applicationArgs>
<dependencies>
<dependency>
<artifactId>org.apache.ant</artifactId>

View file

@ -59,7 +59,13 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
<applicationArgs>
<arg>-application</arg>
<arg>org.eclipse.ant.core.antRunner</arg>
<arg>-buildfile</arg>
<arg>build-index.xml</arg>
<arg>build.index</arg>
</applicationArgs>
<dependencies>
<dependency>
<artifactId>org.apache.ant</artifactId>

View file

@ -59,7 +59,13 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
<applicationArgs>
<arg>-application</arg>
<arg>org.eclipse.ant.core.antRunner</arg>
<arg>-buildfile</arg>
<arg>customBuildCallbacks.xml</arg>
<arg>build.index</arg>
</applicationArgs>
<dependencies>
<dependency>
<artifactId>org.apache.ant</artifactId>

View file

@ -49,12 +49,6 @@
<goals>
<goal>archive-products</goal>
</goals>
<configuration>
<formats>
<linux>tar.gz</linux>
<macosx>tar.gz</macosx>
</formats>
</configuration>
</execution>
</executions>
<configuration>
@ -129,12 +123,6 @@
<goals>
<goal>archive-products</goal>
</goals>
<configuration>
<formats>
<linux>tar.gz</linux>
<macosx>tar.gz</macosx>
</formats>
</configuration>
</execution>
</executions>
<configuration>

View file

@ -60,7 +60,12 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine>
<applicationArgs>
<arg>-application</arg>
<arg>org.eclipse.ant.core.antRunner</arg>
<arg>-buildfile</arg>
<arg>buildDoc.xml</arg>
</applicationArgs>
<dependencies>
<dependency>
<artifactId>org.apache.ant</artifactId>

View file

@ -59,7 +59,13 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
<applicationArgs>
<arg>-application</arg>
<arg>org.eclipse.ant.core.antRunner</arg>
<arg>-buildfile</arg>
<arg>customBuildCallbacks.xml</arg>
<arg>build.index</arg>
</applicationArgs>
<dependencies>
<dependency>
<artifactId>org.apache.ant</artifactId>

12
pom.xml
View file

@ -30,7 +30,7 @@
runs with. It may work with older versions, but this is not
tested or supported. -->
<required-maven-version>3.6.3</required-maven-version>
<tycho-version>2.7.5</tycho-version>
<tycho-version>3.0.3</tycho-version>
<cbi-plugins.version>1.3.4</cbi-plugins.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
@ -831,7 +831,7 @@
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-version}</version>
</dependency>
@ -948,7 +948,13 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
<applicationArgs>
<arg>-application</arg>
<arg>org.eclipse.ant.core.antRunner</arg>
<arg>-buildfile</arg>
<arg>customBuildCallbacks.xml</arg>
<arg>build.index</arg>
</applicationArgs>
<dependencies>
<dependency>
<artifactId>org.apache.ant</artifactId>