564932: fix jenkins build errors in nightly jobs
Change-Id: I8d1fd694fbc1003f20d5ea477c45aee0da9ffbc8
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=564932
diff --git a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.14.target b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.14.target
new file mode 100644
index 0000000..2c659f5
--- /dev/null
+++ b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.14.target
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="mylyn-commons-e4.14">
+ <locations>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="https://dl.bintray.com/subclipse/archive/release/1.8.x"/>
+ <unit id="org.tigris.subversion.clientadapter.feature.feature.group" version="1.8.6"/>
+ <unit id="org.tigris.subversion.subclipse.feature.group" version="1.8.22"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/releases/2019-12"/>
+ <unit id="org.eclipse.e4.rcp.feature.group" version="4.14.0.v20191204-0601"/>
+ <unit id="org.eclipse.e4.rcp.source.feature.group" version="4.14.0.v20191204-0601"/>
+ <unit id="org.eclipse.platform.source.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="4.14.0.I20191210-0610"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.6.0.201912101111-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.6.0.201912101111-r"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.4.1200.v20191210-0610"/>
+ <unit id="org.eclipse.ecf.core.feature.group" version="3.14.5.v20190423-0607"/>
+ <unit id="org.eclipse.ecf.core.source.feature.group" version="3.14.5.v20190423-0607"/>
+ <unit id="org.eclipse.sdk.ide" version="4.14.0.I20191210-0610"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/>
+ <unit id="org.eclipse.cdt.platform.feature.group" version="9.10.0.201912051559"/>
+ <unit id="org.eclipse.cdt.sdk.feature.group" version="9.10.0.201912051559"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+ <unit id="javax.servlet" version="3.0.0.v201112011016"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/>
+ <unit id="org.apache.lucene.analyzers-common.source" version="6.1.0.v20161115-1612"/>
+ <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/>
+ <unit id="org.apache.lucene.core.source" version="6.1.0.v20170814-1820"/>
+ <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/>
+ <unit id="org.apache.lucene.queryparser.source" version="6.1.0.v20161115-1612"/>
+ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository"/>
+ <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
+ <unit id="com.google.gerrit.common" version="2.1.5.v201112241444"/>
+ <unit id="com.google.gerrit.common.source" version="2.1.5.v201112241444"/>
+ <unit id="com.google.gerrit.prettify" version="2.1.5.v201112241444"/>
+ <unit id="com.google.gerrit.prettify.source" version="2.1.5.v201112241444"/>
+ <unit id="com.google.gerrit.reviewdb" version="2.1.5.v201112241444"/>
+ <unit id="com.google.gerrit.reviewdb.source" version="2.1.5.v201112241444"/>
+ <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+ <unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
+ <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
+ <unit id="com.sun.xml.bind" version="2.2.0.v201505121915"/>
+ <unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
+ <unit id="org.mockito" version="1.8.4.v201303031500"/>
+ <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+ <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
+ <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+ <unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/>
+ <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
+ <unit id="org.mockito.source" version="2.23.0.v20190527-1420"/>
+ <unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.generator.source" version="1.1.0.v20090501071000"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/mylyn/snapshots/3.20"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.20.2.v20160630-1640"/>
+ </location>
+ </locations>
+</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons-target/pom.xml b/org.eclipse.mylyn.commons-target/pom.xml
index 4e38e1f..6f4ae88 100644
--- a/org.eclipse.mylyn.commons-target/pom.xml
+++ b/org.eclipse.mylyn.commons-target/pom.xml
@@ -26,9 +26,9 @@
<configuration>
<artifacts>
<artifact>
- <file>mylyn-commons-e4.5.target</file>
+ <file>mylyn-commons-e4.14.target</file>
<type>target</type>
- <classifier>mylyn-commons-e4.5</classifier>
+ <classifier>mylyn-commons-e4.14</classifier>
<!-- used by the gerrit trigger and snapshot build -->
</artifact>
</artifacts>
diff --git a/org.eclipse.mylyn.commons.tck-feature/feature.xml b/org.eclipse.mylyn.commons.tck-feature/feature.xml
index 401bf98..7f75427 100644
--- a/org.eclipse.mylyn.commons.tck-feature/feature.xml
+++ b/org.eclipse.mylyn.commons.tck-feature/feature.xml
@@ -31,7 +31,7 @@
</license>
<requires>
- <import plugin="org.junit" version="4.8.2" match="equivalent"/>
+ <import plugin="org.junit" version="4.8.2" match="compatible"/>
<import plugin="org.hamcrest.core" version="1.1.0" match="equivalent"/>
</requires>
diff --git a/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
index cf11afe..edd93ad 100644
--- a/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@
org.eclipse.mylyn.commons.core;bundle-version="3.8.0",
org.eclipse.mylyn.commons.screenshots;bundle-version="1.0.0",
org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
- com.google.guava;bundle-version="[21.0.0,22.0.0)"
+ com.google.guava;bundle-version="[21.0.0,22.0.0)",
+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin
diff --git a/pom.xml b/pom.xml
index 8b5ea6e..1fa5f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
<groupId>org.eclipse.mylyn.commons</groupId>
<artifactId>org.eclipse.mylyn.commons-target</artifactId>
<version>3.26.0-SNAPSHOT</version>
- <classifier>mylyn-commons-e4.5</classifier>
+ <classifier>mylyn-commons-e4.14</classifier>
</artifact>
</target>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
