diff options
author | Alexander Kurtakov | 2020-04-21 20:38:14 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2020-04-22 04:51:59 +0000 |
commit | c423baf280efda68e6e156bbdc44ba8b0ad26aa5 (patch) | |
tree | 6fad1ebc839e5ef0928f9945e466379601025585 | |
parent | d34bb469d81229dd24007208009e1f6f2670f61c (diff) | |
download | eclipse.platform.releng.aggregator-c423baf280efda68e6e156bbdc44ba8b0ad26aa5.tar.gz eclipse.platform.releng.aggregator-c423baf280efda68e6e156bbdc44ba8b0ad26aa5.tar.xz eclipse.platform.releng.aggregator-c423baf280efda68e6e156bbdc44ba8b0ad26aa5.zip |
Bug 562370 - Remove tycho-extras.version maven property
Remove tycho-extras property. It is no longer needed by anything.
Change-Id: I895448b0851e6859cc5dfb59c712ec92fe3b6e23
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
4 files changed, 19 insertions, 40 deletions
diff --git a/cje-production/X-build/pom.xml b/cje-production/X-build/pom.xml index db6442a0c..14d50a88e 100644 --- a/cje-production/X-build/pom.xml +++ b/cje-production/X-build/pom.xml @@ -67,20 +67,10 @@ <releaseNumberSDK>4.16</releaseNumberSDK> <releaseNumberPlatform>4.16</releaseNumberPlatform> - - <!-- Using snapshot, or locally built (forked) snapshot version for bug 484000. - Need to enable the tycho-snapshot-repo in <pluginRepositories> further down! - Do not use snapshot version for pom-version-updater defined in build-functions.shsource - Use released version for pom-updater - <tycho.version>1.1.0-SNAPSHOT</tycho.version> - <tycho-extras.version>1.1.0-SNAPSHOT</tycho-extras.version> - --> - <!-- using released version (normal case) when upgrading make sure you change pom-version-updater version in build-functions.shsource --> <tycho.version>1.7.0</tycho.version> - <tycho-extras.version>1.7.0</tycho-extras.version> <cbi-plugins.version>1.1.8-SNAPSHOT</cbi-plugins.version> @@ -391,7 +381,7 @@ <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> <!-- this is actually present in any 0.14+ version --> - <version>${tycho-extras.version}</version> + <version>${tycho.version}</version> <configuration> <executionEnvironment>JavaSE-1.8</executionEnvironment> <repositories> @@ -461,12 +451,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> <configuration> @@ -526,7 +516,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <version>${tycho.version}</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor> @@ -660,7 +650,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> @@ -697,7 +687,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> @@ -743,7 +733,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> @@ -756,7 +746,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> @@ -974,7 +964,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-dependency-tools-plugin</artifactId> - <version>${tycho-extras.version}</version> + <version>${tycho.version}</version> <executions> <execution> <id>list-dependencies</id> diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 7b765fa81..a9dfda303 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -68,19 +68,10 @@ <releaseNumberPlatform>4.16</releaseNumberPlatform> - <!-- Using snapshot, or locally built (forked) snapshot version for bug 484000. - Need to enable the tycho-snapshot-repo in <pluginRepositories> further down! - Do not use snapshot version for pom-version-updater defined in build-functions.shsource - Use released version for pom-updater - <tycho.version>1.1.0-SNAPSHOT</tycho.version> - <tycho-extras.version>1.1.0-SNAPSHOT</tycho-extras.version> - --> - <!-- using released version (normal case) when upgrading make sure you change pom-version-updater version in build-functions.shsource --> <tycho.version>1.7.0</tycho.version> - <tycho-extras.version>1.7.0</tycho-extras.version> <cbi-plugins.version>1.1.8-SNAPSHOT</cbi-plugins.version> @@ -391,7 +382,7 @@ <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> <!-- this is actually present in any 0.14+ version --> - <version>${tycho-extras.version}</version> + <version>${tycho.version}</version> <configuration> <executionEnvironment>JavaSE-1.8</executionEnvironment> <repositories> @@ -461,12 +452,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> <configuration> @@ -526,7 +517,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <version>${tycho.version}</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor> @@ -660,7 +651,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> @@ -697,7 +688,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> @@ -743,7 +734,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> @@ -756,7 +747,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> @@ -974,7 +965,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-dependency-tools-plugin</artifactId> - <version>${tycho-extras.version}</version> + <version>${tycho.version}</version> <executions> <execution> <id>list-dependencies</id> diff --git a/eclipse-platform-parent/saveproperties/mavenproperties.properties b/eclipse-platform-parent/saveproperties/mavenproperties.properties index 1aaa2cb2a..8693043ba 100644 --- a/eclipse-platform-parent/saveproperties/mavenproperties.properties +++ b/eclipse-platform-parent/saveproperties/mavenproperties.properties @@ -1,8 +1,6 @@ # typical properties we may need elsewhere, such as # to display in reports or PHP pages -tycho-extras.version=${tycho-extras.version} -#tycho-repo.url=${tycho-repo.url} tycho.debug.artifactcomparator=${tycho.debug.artifactcomparator} tycho.localArtifacts=${tycho.localArtifacts} tycho.version=${tycho.version} diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml index 63b922b8c..ed90832a9 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml @@ -81,7 +81,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-p2-extras-plugin</artifactId> - <version>${tycho-extras.version}</version> + <version>${tycho.version}</version> <executions> <execution> <phase>package</phase> |