diff options
-rw-r--r-- | org.eclipse.m2e.binaryproject.tests/pom.xml | 22 | ||||
-rw-r--r-- | org.eclipse.m2e.importer.tests/pom.xml | 41 |
2 files changed, 50 insertions, 13 deletions
diff --git a/org.eclipse.m2e.binaryproject.tests/pom.xml b/org.eclipse.m2e.binaryproject.tests/pom.xml index 45375457..d2e02a77 100644 --- a/org.eclipse.m2e.binaryproject.tests/pom.xml +++ b/org.eclipse.m2e.binaryproject.tests/pom.xml @@ -18,4 +18,26 @@ <artifactId>org.eclipse.m2e.binaryproject.tests</artifactId> <packaging>eclipse-test-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=541403 --> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>javax.annotation</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> </project>
\ No newline at end of file diff --git a/org.eclipse.m2e.importer.tests/pom.xml b/org.eclipse.m2e.importer.tests/pom.xml index 7f192047..4672334c 100644 --- a/org.eclipse.m2e.importer.tests/pom.xml +++ b/org.eclipse.m2e.importer.tests/pom.xml @@ -25,18 +25,33 @@ Contributors: <name>Tests for Maven Integration for Eclipse Importer framework</name> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIHarness>true</useUIHarness> - <useUIThread>false</useUIThread> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=541403 --> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>p2-installable-unit</type> + <id>javax.annotation</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>false</useUIThread> + </configuration> + </plugin> + </plugins> </build> </project> |