summaryrefslogtreecommitdiffstats
authorJan Sievers2012-02-01 09:47:24 (EST)
committer Jan Sievers2012-02-01 09:47:24 (EST)
commit131a674db90ed77db02aca9077ab3e070495504d (patch) (side-by-side diff)
tree6369262d14d5c933dc80e4bb03291ca6b68c1e38
parent08e7b4fa1e86341dee93188cadf2943ac23b052c (diff)
downloadorg.eclipse.tycho-131a674db90ed77db02aca9077ab3e070495504d.zip
org.eclipse.tycho-131a674db90ed77db02aca9077ab3e070495504d.tar.gz
org.eclipse.tycho-131a674db90ed77db02aca9077ab3e070495504d.tar.bz2
370327 Remove hardcoded tycho version from ITs
Use ${tycho-version} instead which is automatically set by AbstractTychoIntegrationTest.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--tycho-its/projects/351842_testOptionalDependencies/pom.xml5
-rw-r--r--tycho-its/projects/363331_extraTargetPlatformRequirements/artificial/pom.xml1
-rw-r--r--tycho-its/projects/363331_extraTargetPlatformRequirements/dynamicimport-package/pom.xml1
-rw-r--r--tycho-its/projects/363331_extraTargetPlatformRequirements/fragment-split-package/pom.xml1
-rw-r--r--tycho-its/projects/363331_extraTargetPlatformRequirements/implicit-fragment-import-package/pom.xml1
-rw-r--r--tycho-its/projects/363331_extraTargetPlatformRequirements/import-package-directives/pom.xml1
-rw-r--r--tycho-its/projects/366456_multienv_p2inf/pom.xml15
-rw-r--r--tycho-its/projects/367637_autoNoSourceBundle/pom.xml8
-rw-r--r--tycho-its/projects/367701_reactorIndirectOptionalDependencies/pom.xml5
-rw-r--r--tycho-its/projects/368079_productArchiveFormat/pom.xml7
-rw-r--r--tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml2
-rw-r--r--tycho-its/projects/368985_licenseFeature/pom.xml5
-rw-r--r--tycho-its/projects/369758_productFileFiltering/pom.xml9
13 files changed, 23 insertions, 38 deletions
diff --git a/tycho-its/projects/351842_testOptionalDependencies/pom.xml b/tycho-its/projects/351842_testOptionalDependencies/pom.xml
index 31598a5..fae4aec 100644
--- a/tycho-its/projects/351842_testOptionalDependencies/pom.xml
+++ b/tycho-its/projects/351842_testOptionalDependencies/pom.xml
@@ -8,7 +8,6 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <tycho.version>0.14.0-SNAPSHOT</tycho.version>
<e342-repo>http://download.eclipse.org/eclipse/updates/3.4</e342-repo>
<e352-repo>http://download.eclipse.org/eclipse/updates/3.5</e352-repo>
</properties>
@@ -31,13 +30,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<!--
diff --git a/tycho-its/projects/363331_extraTargetPlatformRequirements/artificial/pom.xml b/tycho-its/projects/363331_extraTargetPlatformRequirements/artificial/pom.xml
index f1a03bc..35bf828 100644
--- a/tycho-its/projects/363331_extraTargetPlatformRequirements/artificial/pom.xml
+++ b/tycho-its/projects/363331_extraTargetPlatformRequirements/artificial/pom.xml
@@ -8,7 +8,6 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <tycho-version>0.14.0-SNAPSHOT</tycho-version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
<e352-repo>http://download.eclipse.org/releases/galileo</e352-repo>
</properties>
diff --git a/tycho-its/projects/363331_extraTargetPlatformRequirements/dynamicimport-package/pom.xml b/tycho-its/projects/363331_extraTargetPlatformRequirements/dynamicimport-package/pom.xml
index c5aa315..4d77ffc 100644
--- a/tycho-its/projects/363331_extraTargetPlatformRequirements/dynamicimport-package/pom.xml
+++ b/tycho-its/projects/363331_extraTargetPlatformRequirements/dynamicimport-package/pom.xml
@@ -21,7 +21,6 @@
</description>
<properties>
- <tycho-version>0.14.0-SNAPSHOT</tycho-version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
diff --git a/tycho-its/projects/363331_extraTargetPlatformRequirements/fragment-split-package/pom.xml b/tycho-its/projects/363331_extraTargetPlatformRequirements/fragment-split-package/pom.xml
index c3845a1..27a3dba 100644
--- a/tycho-its/projects/363331_extraTargetPlatformRequirements/fragment-split-package/pom.xml
+++ b/tycho-its/projects/363331_extraTargetPlatformRequirements/fragment-split-package/pom.xml
@@ -14,7 +14,6 @@
</description>
<properties>
- <tycho-version>0.14.0-SNAPSHOT</tycho-version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
diff --git a/tycho-its/projects/363331_extraTargetPlatformRequirements/implicit-fragment-import-package/pom.xml b/tycho-its/projects/363331_extraTargetPlatformRequirements/implicit-fragment-import-package/pom.xml
index cda3280..3f26582 100644
--- a/tycho-its/projects/363331_extraTargetPlatformRequirements/implicit-fragment-import-package/pom.xml
+++ b/tycho-its/projects/363331_extraTargetPlatformRequirements/implicit-fragment-import-package/pom.xml
@@ -14,7 +14,6 @@
</description>
<properties>
- <tycho-version>0.14.0-SNAPSHOT</tycho-version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
diff --git a/tycho-its/projects/363331_extraTargetPlatformRequirements/import-package-directives/pom.xml b/tycho-its/projects/363331_extraTargetPlatformRequirements/import-package-directives/pom.xml
index ba4ba60..82fbdc7 100644
--- a/tycho-its/projects/363331_extraTargetPlatformRequirements/import-package-directives/pom.xml
+++ b/tycho-its/projects/363331_extraTargetPlatformRequirements/import-package-directives/pom.xml
@@ -26,7 +26,6 @@
</description>
<properties>
- <tycho-version>0.14.0-SNAPSHOT</tycho-version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
diff --git a/tycho-its/projects/366456_multienv_p2inf/pom.xml b/tycho-its/projects/366456_multienv_p2inf/pom.xml
index 9e8fba8..227d7ca 100644
--- a/tycho-its/projects/366456_multienv_p2inf/pom.xml
+++ b/tycho-its/projects/366456_multienv_p2inf/pom.xml
@@ -8,7 +8,6 @@
<packaging>pom</packaging>
<properties>
- <tycho.version>0.14.0-SNAPSHOT</tycho.version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
@@ -31,7 +30,7 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
@@ -61,32 +60,32 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/pom.xml b/tycho-its/projects/367637_autoNoSourceBundle/pom.xml
index 372b2be..aed4664 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/pom.xml
+++ b/tycho-its/projects/367637_autoNoSourceBundle/pom.xml
@@ -7,10 +7,6 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <tycho.version>0.14.0-SNAPSHOT</tycho.version>
- </properties>
-
<modules>
<module>bundle</module>
<module>feature</module>
@@ -21,14 +17,14 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<executions>
<execution>
<id>plugin-source</id>
diff --git a/tycho-its/projects/367701_reactorIndirectOptionalDependencies/pom.xml b/tycho-its/projects/367701_reactorIndirectOptionalDependencies/pom.xml
index 73ec849..64d15c3 100644
--- a/tycho-its/projects/367701_reactorIndirectOptionalDependencies/pom.xml
+++ b/tycho-its/projects/367701_reactorIndirectOptionalDependencies/pom.xml
@@ -32,7 +32,6 @@
</description>
<properties>
- <tycho.version>0.14.0-SNAPSHOT</tycho.version>
<e342-repo>http://download.eclipse.org/eclipse/updates/3.4</e342-repo>
</properties>
@@ -54,13 +53,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<configuration>
<optionalDependencies>ignore</optionalDependencies>
</configuration>
diff --git a/tycho-its/projects/368079_productArchiveFormat/pom.xml b/tycho-its/projects/368079_productArchiveFormat/pom.xml
index 3005ba0..3307fa5 100644
--- a/tycho-its/projects/368079_productArchiveFormat/pom.xml
+++ b/tycho-its/projects/368079_productArchiveFormat/pom.xml
@@ -9,7 +9,6 @@
<packaging>eclipse-repository</packaging>
<properties>
- <tycho.version>0.14.0-SNAPSHOT</tycho.version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
@@ -26,14 +25,14 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<configuration>
<environments>
<environment>
@@ -58,7 +57,7 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<executions>
<execution>
<id>materialize-products</id>
diff --git a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml b/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml
index a804ef9..eeadfc6 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml
+++ b/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml
@@ -18,7 +18,7 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<configuration>
<allowConflictingDependencies>true</allowConflictingDependencies>
</configuration>
diff --git a/tycho-its/projects/368985_licenseFeature/pom.xml b/tycho-its/projects/368985_licenseFeature/pom.xml
index f836bfd..e357c67 100644
--- a/tycho-its/projects/368985_licenseFeature/pom.xml
+++ b/tycho-its/projects/368985_licenseFeature/pom.xml
@@ -8,7 +8,6 @@
<packaging>pom</packaging>
<properties>
- <tycho.version>0.14.0-SNAPSHOT</tycho.version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
@@ -32,14 +31,14 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<configuration>
<forceContextQualifier>123abc</forceContextQualifier>
</configuration>
diff --git a/tycho-its/projects/369758_productFileFiltering/pom.xml b/tycho-its/projects/369758_productFileFiltering/pom.xml
index 86bc8aa..cd4eb6d 100644
--- a/tycho-its/projects/369758_productFileFiltering/pom.xml
+++ b/tycho-its/projects/369758_productFileFiltering/pom.xml
@@ -9,7 +9,6 @@
<packaging>eclipse-repository</packaging>
<properties>
- <tycho.version>0.14.0-SNAPSHOT</tycho.version>
<e342-repo>http://download.eclipse.org/releases/ganymede</e342-repo>
</properties>
@@ -26,14 +25,14 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<configuration>
<environments>
<environment>
@@ -48,7 +47,7 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<executions>
<execution>
<id>materialize-products</id>
@@ -73,7 +72,7 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
+ <version>${tycho-version}</version>
<configuration>
<forceContextQualifier>123abc</forceContextQualifier>
</configuration>