Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2019-05-31 08:03:05 -0400
committerAlexander Kurtakov2019-05-31 08:03:05 -0400
commitaa4cfeea48ed4874ec4acbd8dd7778863b94eee0 (patch)
treeeca214a2602c2e699b7db2af8130ff581b7ed0cc
parent9029d88ab28ad87198712daa41322cec01899440 (diff)
downloadm2e-core-aa4cfeea48ed4874ec4acbd8dd7778863b94eee0.tar.gz
m2e-core-aa4cfeea48ed4874ec4acbd8dd7778863b94eee0.tar.xz
m2e-core-aa4cfeea48ed4874ec4acbd8dd7778863b94eee0.zip
Remove workaround for javax.annotation and Java 11.
Tycho 1.4(which m2e uses now) handles removed modules properly now. Change-Id: I93ec79db7efb3fb358b70760b18770f0926b0e20 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--org.eclipse.m2e.binaryproject.tests/pom.xml20
-rw-r--r--org.eclipse.m2e.importer.tests/pom.xml16
2 files changed, 0 insertions, 36 deletions
diff --git a/org.eclipse.m2e.binaryproject.tests/pom.xml b/org.eclipse.m2e.binaryproject.tests/pom.xml
index eef6df03..db22d70c 100644
--- a/org.eclipse.m2e.binaryproject.tests/pom.xml
+++ b/org.eclipse.m2e.binaryproject.tests/pom.xml
@@ -19,24 +19,4 @@
<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>
- <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 f9638d26..33544cdc 100644
--- a/org.eclipse.m2e.importer.tests/pom.xml
+++ b/org.eclipse.m2e.importer.tests/pom.xml
@@ -28,22 +28,6 @@ Contributors:
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <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>
<configuration>
<useUIHarness>true</useUIHarness>

Back to the top