193 lines
6.2 KiB
Diff
193 lines
6.2 KiB
Diff
From 1fc5ec4dcccd0951860f9db6f485fd3c00a4a684 Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
Date: Tue, 29 Mar 2011 17:58:43 +0200
|
|
Subject: [PATCH] Remove tycho-testing-harness
|
|
|
|
It needs maven2 parts to build, but we need depmap for other parts of tycho.
|
|
Thus we disable it for now and this is not a big deal because we are not
|
|
running tests anyway (yet).
|
|
---
|
|
maven-osgi-compiler-plugin/pom.xml | 10 ++++------
|
|
maven-osgi-packaging-plugin/pom.xml | 10 ++++------
|
|
maven-tycho-plugin/pom.xml | 6 ------
|
|
pom.xml | 1 -
|
|
tycho-osgi-components/pom.xml | 10 ++++------
|
|
tycho-p2/tycho-p2-director-plugin/pom.xml | 6 ------
|
|
tycho-p2/tycho-p2-publisher-plugin/pom.xml | 6 ------
|
|
tycho-release/tycho-versions-plugin/pom.xml | 8 +-------
|
|
8 files changed, 13 insertions(+), 44 deletions(-)
|
|
|
|
diff --git a/maven-osgi-compiler-plugin/pom.xml b/maven-osgi-compiler-plugin/pom.xml
|
|
index 6e55905..9d0979a 100644
|
|
--- a/maven-osgi-compiler-plugin/pom.xml
|
|
+++ b/maven-osgi-compiler-plugin/pom.xml
|
|
@@ -64,18 +64,16 @@
|
|
<artifactId>tycho-compiler-jdt</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.maven</groupId>
|
|
+ <artifactId>maven-artifact</artifactId>
|
|
+ </dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.maven.plugin-testing</groupId>
|
|
<artifactId>maven-plugin-testing-harness</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
- <dependency>
|
|
- <groupId>org.sonatype.tycho</groupId>
|
|
- <artifactId>tycho-testing-harness</artifactId>
|
|
- <version>${project.version}</version>
|
|
- <scope>test</scope>
|
|
- </dependency>
|
|
</dependencies>
|
|
|
|
</project>
|
|
diff --git a/maven-osgi-packaging-plugin/pom.xml b/maven-osgi-packaging-plugin/pom.xml
|
|
index d7faeac..7fc5e5a 100644
|
|
--- a/maven-osgi-packaging-plugin/pom.xml
|
|
+++ b/maven-osgi-packaging-plugin/pom.xml
|
|
@@ -24,12 +24,6 @@
|
|
<artifactId>tycho-equinox</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
- <dependency>
|
|
- <groupId>org.sonatype.tycho</groupId>
|
|
- <artifactId>tycho-testing-harness</artifactId>
|
|
- <version>${project.version}</version>
|
|
- <scope>test</scope>
|
|
- </dependency>
|
|
|
|
<dependency>
|
|
<groupId>commons-lang</groupId>
|
|
@@ -41,6 +35,10 @@
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.maven</groupId>
|
|
+ <artifactId>maven-artifact</artifactId>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.maven</groupId>
|
|
<artifactId>maven-plugin-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
diff --git a/maven-tycho-plugin/pom.xml b/maven-tycho-plugin/pom.xml
|
|
index 5f6c55e..af1ea97 100644
|
|
--- a/maven-tycho-plugin/pom.xml
|
|
+++ b/maven-tycho-plugin/pom.xml
|
|
@@ -65,12 +65,6 @@
|
|
<artifactId>maven-plugin-testing-harness</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
- <dependency>
|
|
- <groupId>org.sonatype.tycho</groupId>
|
|
- <artifactId>tycho-testing-harness</artifactId>
|
|
- <version>${project.version}</version>
|
|
- <scope>test</scope>
|
|
- </dependency>
|
|
</dependencies>
|
|
|
|
</project>
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 7197d73..14cce0b 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -509,7 +509,6 @@
|
|
<module>tycho-equinox</module>
|
|
<module>tycho-bootstrap-maven-plugin</module>
|
|
<module>tycho-osgi-components</module>
|
|
- <module>tycho-testing-harness</module>
|
|
|
|
</modules>
|
|
</profile>
|
|
diff --git a/tycho-osgi-components/pom.xml b/tycho-osgi-components/pom.xml
|
|
index 8967ed4..1bb9d77 100644
|
|
--- a/tycho-osgi-components/pom.xml
|
|
+++ b/tycho-osgi-components/pom.xml
|
|
@@ -50,6 +50,10 @@
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.maven</groupId>
|
|
+ <artifactId>maven-artifact</artifactId>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.maven</groupId>
|
|
<artifactId>maven-plugin-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
@@ -76,12 +80,6 @@
|
|
</dependency>
|
|
|
|
<dependency>
|
|
- <groupId>org.sonatype.tycho</groupId>
|
|
- <artifactId>tycho-testing-harness</artifactId>
|
|
- <version>${project.version}</version>
|
|
- <scope>test</scope>
|
|
- </dependency>
|
|
- <dependency>
|
|
<groupId>org.easymock</groupId>
|
|
<artifactId>easymock</artifactId>
|
|
<version>3.0</version>
|
|
diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml
|
|
index 5340831..85357dc 100644
|
|
--- a/tycho-p2/tycho-p2-director-plugin/pom.xml
|
|
+++ b/tycho-p2/tycho-p2-director-plugin/pom.xml
|
|
@@ -41,12 +41,6 @@
|
|
</dependency>
|
|
|
|
<dependency>
|
|
- <groupId>org.sonatype.tycho</groupId>
|
|
- <artifactId>tycho-testing-harness</artifactId>
|
|
- <version>${project.version}</version>
|
|
- <scope>test</scope>
|
|
- </dependency>
|
|
- <dependency>
|
|
<groupId>org.easymock</groupId>
|
|
<artifactId>easymock</artifactId>
|
|
<version>3.0</version>
|
|
diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
|
|
index f736ff1..ee2fb63 100644
|
|
--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
|
|
+++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
|
|
@@ -37,12 +37,6 @@
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
- <groupId>org.sonatype.tycho</groupId>
|
|
- <artifactId>tycho-testing-harness</artifactId>
|
|
- <version>${project.version}</version>
|
|
- <scope>test</scope>
|
|
- </dependency>
|
|
- <dependency>
|
|
<groupId>org.apache.maven.surefire</groupId>
|
|
<artifactId>surefire-booter</artifactId>
|
|
</dependency>
|
|
diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml
|
|
index 24a0275..e9274a8 100644
|
|
--- a/tycho-release/tycho-versions-plugin/pom.xml
|
|
+++ b/tycho-release/tycho-versions-plugin/pom.xml
|
|
@@ -28,12 +28,6 @@
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
|
|
- <dependency>
|
|
- <groupId>org.sonatype.tycho</groupId>
|
|
- <artifactId>tycho-testing-harness</artifactId>
|
|
- <version>${project.version}</version>
|
|
- <scope>test</scope>
|
|
- </dependency>
|
|
|
|
</dependencies>
|
|
|
|
@@ -46,4 +40,4 @@
|
|
</plugins>
|
|
</build>
|
|
|
|
-</project>
|
|
\ No newline at end of file
|
|
+</project>
|
|
--
|
|
1.7.4
|
|
|