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