427d469347
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/tycho.git#3a6b64e698aca93760e544bc3739e4b0d934dcd9
89 lines
3.1 KiB
Diff
89 lines
3.1 KiB
Diff
From 085015460b077536f94cafeb21a3ce868fd56096 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 5/7] 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 | 4 ++--
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
|
|
index 55a4107..4af01c5 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 416abd1..53ddf73 100644
|
|
--- a/tycho-extras/pom.xml
|
|
+++ b/tycho-extras/pom.xml
|
|
@@ -72,28 +72,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 bfccba8..2d4162c 100644
|
|
--- a/tycho-extras/tycho-source-feature-plugin/pom.xml
|
|
+++ b/tycho-extras/tycho-source-feature-plugin/pom.xml
|
|
@@ -42,14 +42,14 @@
|
|
<dependency>
|
|
<groupId>org.eclipse.tycho</groupId>
|
|
<artifactId>tycho-packaging-plugin</artifactId>
|
|
- <version>${tycho-version}</version>
|
|
+ <version>${project.version}</version>
|
|
<type>maven-plugin</type>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.eclipse.tycho</groupId>
|
|
<artifactId>tycho-source-plugin</artifactId>
|
|
- <version>${tycho-version}</version>
|
|
+ <version>${project.version}</version>
|
|
<type>maven-plugin</type>
|
|
</dependency>
|
|
|
|
--
|
|
2.28.0
|
|
|