Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2020-04-21 20:38:14 +0000
committerAlexander Kurtakov2020-04-22 04:51:59 +0000
commitc423baf280efda68e6e156bbdc44ba8b0ad26aa5 (patch)
tree6fad1ebc839e5ef0928f9945e466379601025585 /eclipse-platform-parent
parentd34bb469d81229dd24007208009e1f6f2670f61c (diff)
downloadeclipse.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>
Diffstat (limited to 'eclipse-platform-parent')
-rw-r--r--eclipse-platform-parent/pom.xml27
-rw-r--r--eclipse-platform-parent/saveproperties/mavenproperties.properties2
2 files changed, 9 insertions, 20 deletions
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}

Back to the top