rpms/tycho
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5e2a21ddf5
tycho/tycho-fix-bootstrap-build.patch
Mikolaj Izdebski 5e2a21ddf5 Rebase tycho-fix-bootstrap-build.patch
2014-06-04 09:23:24 +02:00

233 lines
8.0 KiB
Diff
Raw Blame History

diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
index ef8182a..52d98fc 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -51,6 +51,15 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
index 790e756..8e4f294 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -25,10 +25,19 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml
index 3d00c67..67d5ed2 100644
--- a/tycho-compiler-plugin/pom.xml
+++ b/tycho-compiler-plugin/pom.xml
@@ -63,19 +63,6 @@
</dependency>
<dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-testing-harness</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
<groupId>bcel</groupId>
<artifactId>bcel</artifactId>
<scope>test</scope>
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index 853bcf4..9cde68b 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -59,11 +59,19 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- </plugin>
-
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -152,12 +157,6 @@
<version>1.1.0</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-testing-harness</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
diff --git a/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index 4ace7ab..edaf13f 100644
--- a/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -92,9 +92,6 @@
org.eclipse.tycho:tycho-packaging-plugin:${project.version}:package-plugin,
org.eclipse.tycho:tycho-p2-plugin:${project.version}:p2-metadata-default
</package>
- <integration-test>
- org.eclipse.tycho:tycho-surefire-plugin:${project.version}:test
- </integration-test>
<install>
org.apache.maven.plugins:maven-install-plugin:${install-plugin.version}:install,
org.eclipse.tycho:tycho-p2-plugin:${project.version}:update-local-index
diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml
index 02a37e1..b078fc9 100644
--- a/tycho-p2/tycho-p2-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-plugin/pom.xml
@@ -50,21 +50,23 @@
<artifactId>tycho-artifactcomparator</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-testing-harness</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
index 4a75ef1..4dd136a 100644
--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
@@ -45,12 +45,6 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-testing-harness</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml
index 908fbf9..25cbd22 100644
--- a/tycho-packaging-plugin/pom.xml
+++ b/tycho-packaging-plugin/pom.xml
@@ -32,19 +32,6 @@
<artifactId>tycho-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-testing-harness</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
@@ -78,10 +65,19 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Reference in New Issue View Git Blame Copy Permalink