diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml index d2fb7ed84e1..bb7dae33395 100644 --- a/build/org.eclipse.cdt.autotools.docs/pom.xml +++ b/build/org.eclipse.cdt.autotools.docs/pom.xml @@ -47,7 +47,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine> <dependencies> diff --git a/build/org.eclipse.cdt.meson.docs/pom.xml b/build/org.eclipse.cdt.meson.docs/pom.xml index 80da41c7987..f5079653aba 100644 --- a/build/org.eclipse.cdt.meson.docs/pom.xml +++ b/build/org.eclipse.cdt.meson.docs/pom.xml @@ -47,7 +47,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine> <dependencies> diff --git a/debug/org.eclipse.cdt.debug.application.doc/pom.xml b/debug/org.eclipse.cdt.debug.application.doc/pom.xml index 52780afd1ff..64cdfda98a9 100644 --- a/debug/org.eclipse.cdt.debug.application.doc/pom.xml +++ b/debug/org.eclipse.cdt.debug.application.doc/pom.xml @@ -47,7 +47,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <dependencies> diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml index 3076f02ab30..d221005cc9f 100644 --- a/doc/org.eclipse.cdt.doc.isv/pom.xml +++ b/doc/org.eclipse.cdt.doc.isv/pom.xml @@ -48,7 +48,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine> <dependencies> diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml index 08f8b76ecf8..2d12c0151c4 100644 --- a/doc/org.eclipse.cdt.doc.user/pom.xml +++ b/doc/org.eclipse.cdt.doc.user/pom.xml @@ -47,7 +47,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <dependencies> diff --git a/pom.xml b/pom.xml index ee5387f028b..5b70e09a095 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +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>1.6.0</tycho-version> - <tycho-extras-version>1.6.0</tycho-extras-version> + <tycho-version>1.7.0</tycho-version> <cbi-plugins.version>1.1.7</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> @@ -423,7 +422,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <executions> <execution> <id>source-feature</id> @@ -563,7 +562,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <executions> <execution> <id>pack200-normalize</id> @@ -591,7 +590,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <executions> <execution> <id>pack200-pack</id> @@ -711,7 +710,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <configuration> <includeBinaryFeature>false</includeBinaryFeature> </configuration> @@ -847,12 +846,12 @@ <dependency> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-buildtimestamp-jgit</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> </dependency> <dependency> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-sourceref-jgit</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> </dependency> </dependencies> </plugin> @@ -961,7 +960,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <dependencies>