From bf0f458e2cd41ad24ff212014a416c788477bfc4 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 20 Mar 2020 02:35:02 +0000
Subject: [PATCH 7/8] Fix dependency problems when bootstrapping with extras
---
tycho-extras/pack200/tycho-pack200b-plugin/pom.xml | 4 ++--
tycho-extras/pom.xml | 10 +++++-----
tycho-extras/tycho-source-feature-plugin/pom.xml | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
index f305eb3..4a3150b 100644
--- a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
+++ b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
- <version>${tycho-version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/tycho-extras/pom.xml b/tycho-extras/pom.xml
index 1769197..68c2bbe 100644
--- a/tycho-extras/pom.xml
+++ b/tycho-extras/pom.xml
@@ -88,28 +88,28 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-core</artifactId>
- <version>${tycho-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-facade</artifactId>
- <version>${tycho-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.tycho.core.shared</artifactId>
- <version>${tycho-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-testing-harness</artifactId>
- <version>${tycho-version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox-launching</artifactId>
- <version>${tycho-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-extras/tycho-source-feature-plugin/pom.xml b/tycho-extras/tycho-source-feature-plugin/pom.xml
index e305460..29fa308 100644
--- a/tycho-extras/tycho-source-feature-plugin/pom.xml
+++ b/tycho-extras/tycho-source-feature-plugin/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
+ <version>${project.version}</version>
<type>maven-plugin</type>
</dependency>
--
2.21.1