[RelEng] Fixed test setup for 2018-12

eclipse-mpc · Nov 7, 2018 · 295d4a6 · 295d4a6
1 parent 9c36de0
commit 295d4a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/org.eclipse.epp.mpc-parent/pom.xml b/org.eclipse.epp.mpc-parent/pom.xml
@@ -22,7 +22,7 @@
       <enforced.java.version>[1.8.0,)</enforced.java.version>
       <java-jdk>SYSTEM</java-jdk>
 
-      <tycho-version>1.1.0</tycho-version>
+      <tycho-version>1.2.0</tycho-version>
       <tycho-extras-version>${tycho-version}</tycho-extras-version>
 
       <qualifier-format>'v'yyyyMMdd-HHmm</qualifier-format>

diff --git a/org.eclipse.epp.mpc-target/staging.target b/org.eclipse.epp.mpc-target/staging.target
@@ -5,6 +5,7 @@
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.ds" version="0.0.0"/>
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.10-I-builds"/>
 </location>

diff --git a/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.userstorage;bundle-version="[1.1.0,2.0.0)",
  org.apache.httpcomponents.httpclient;bundle-version="[4.5.0,4.6.0)",
  org.apache.httpcomponents.httpcore;bundle-version="[4.4.0,4.5.0)",
- org.mockito;bundle-version="1.9.5"
+ org.mockito;bundle-version="1.9.5",
+ org.eclipse.equinox.ds;resolution:=optional
 Import-Package: org.eclipse.ecf.core;version="3.0.0",
  org.eclipse.ecf.core.util,
  org.eclipse.ecf.filetransfer,