Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2019-01-08 04:37:14 -0500
committerMickael Istria2019-01-08 05:01:37 -0500
commit048850a7372c7631896a24cfbe94fea7d7cd4676 (patch)
tree2506a98055f60c46722c4d334dbdf99e99568978
parenta897b1e9c59c3cd2ff96ea4508ffd582e6f983db (diff)
downloadm2e-core-048850a7372c7631896a24cfbe94fea7d7cd4676.tar.gz
m2e-core-048850a7372c7631896a24cfbe94fea7d7cd4676.tar.xz
m2e-core-048850a7372c7631896a24cfbe94fea7d7cd4676.zip
Support testing on Java 11
Change-Id: I818fbd17bb46066e2a33c20938b7d0d39ad1119c Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--org.eclipse.m2e.binaryproject.tests/pom.xml22
-rw-r--r--org.eclipse.m2e.importer.tests/pom.xml41
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>

Back to the top