mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Build with Tycho 1.7.0

Browse source 
Get rid of tycho-extras-version as there is no more tycho-extras.

Change-Id: I9d215aad94c4e8320153f06368d6b3ecfa4a3c42
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
This commit is contained in:
Alexander Kurtakov 2020-07-22 09:21:27 +03:00
parent c58603dfbe
commit d593c7a25f
6 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.autotools.docs/pom.xml
View file

@ -47,7 +47,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
<dependencies> <dependencies>

2
build/org.eclipse.cdt.meson.docs/pom.xml
View file

@ -47,7 +47,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
<dependencies> <dependencies>

2
debug/org.eclipse.cdt.debug.application.doc/pom.xml
View file

@ -47,7 +47,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
<dependencies> <dependencies>

2
doc/org.eclipse.cdt.doc.isv/pom.xml
View file

@ -48,7 +48,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine>
<dependencies> <dependencies>

2
doc/org.eclipse.cdt.doc.user/pom.xml
View file

@ -47,7 +47,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
<dependencies> <dependencies>

17
pom.xml
View file

@ -30,8 +30,7 @@
runs with. It may work with older versions, but this is not runs with. It may work with older versions, but this is not
tested or supported. --> tested or supported. -->
<required-maven-version>3.6.3</required-maven-version> <required-maven-version>3.6.3</required-maven-version>
<tycho-version>1.6.0</tycho-version> <tycho-version>1.7.0</tycho-version>
<tycho-extras-version>1.6.0</tycho-extras-version>
<cbi-plugins.version>1.1.7</cbi-plugins.version> <cbi-plugins.version>1.1.7</cbi-plugins.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <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> <cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
@ -423,7 +422,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId> <artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<executions> <executions>
<execution> <execution>
<id>source-feature</id> <id>source-feature</id>
@ -563,7 +562,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId> <artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<executions> <executions>
<execution> <execution>
<id>pack200-normalize</id> <id>pack200-normalize</id>
@ -591,7 +590,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId> <artifactId>tycho-pack200b-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<executions> <executions>
<execution> <execution>
<id>pack200-pack</id> <id>pack200-pack</id>
@ -711,7 +710,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId> <artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<includeBinaryFeature>false</includeBinaryFeature> <includeBinaryFeature>false</includeBinaryFeature>
</configuration> </configuration>
@ -847,12 +846,12 @@
<dependency> <dependency>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId> <artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId> <artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -961,7 +960,7 @@
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
<dependencies> <dependencies>