Bug 538397 - DLTK should be able to work with RSE 4.5
Bug 538397 - update DLTK Target Platform to support Lucene 6.1 (because Mylyn 3.24+ still requires it) and 7.1 (because TM/RSE 4.5 requires it), plus build against Simrel 2018-09 instead of Photon
Change-Id: I95a33e81ba29f71524727eaec0e476f6620bd99e
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target b/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
index 95cd057..c8a18f5 100644
--- a/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
+++ b/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
@@ -15,6 +15,8 @@
<unit id="org.apache.lucene.core.source" version="7.1.0.v20171214-1510"/>
<unit id="org.apache.lucene.misc" version="7.1.0.v20180220-1923"/>
<unit id="org.apache.lucene.misc.source" version="7.1.0.v20180220-1923"/>
+ <unit id="org.apache.lucene.queryparser" version="7.1.0.v20180828-2118"/>
+ <unit id="org.apache.lucene.queryparser.source" version="7.1.0.v20180828-2118"/>
<unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/>
<unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/>
<unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/>
@@ -30,17 +32,30 @@
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ <unit id="net.bytebuddy.byte-buddy" version="0.0.0"/>
+ <unit id="net.bytebuddy.byte-buddy-agent" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/tools/orbit/I-builds/I20180829144012/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/staging/2018-09/"/>
+ </location>
+ <!-- mylyn 3.24 depends on lucene 6.1, but DTP depends on lucene 7.1 -->
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.mylyn.context.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/mylyn/drops/3.24.1/v20180619-2220/"/>
+ <!-- <repository location="http://download.eclipse.org/mylyn/snapshots/nightly/"/> -->
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.linuxtools.man.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/linuxtools/update"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.rse.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/photon/"/>
+ <repository location="http://download.eclipse.org/tm/updates/4.5.0-SNAPSHOT/repository/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
diff --git a/rse/features/org.eclipse.dltk.rse-feature/feature.xml b/rse/features/org.eclipse.dltk.rse-feature/feature.xml
index 94d4813..0cc2392 100644
--- a/rse/features/org.eclipse.dltk.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.dltk.rse-feature/feature.xml
@@ -40,7 +40,7 @@
<requires>
<import feature="org.eclipse.dltk.core" version="5.0.0" match="compatible"/>
- <import feature="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
+ <import feature="org.eclipse.rse.core"/>
</requires>
<plugin
diff --git a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
index 2b3ce67..1fb6420 100644
--- a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@
org.eclipse.rse.efs,
org.eclipse.rse.services,
org.eclipse.rse.connectorservice.ssh;resolution:=optional,
- org.eclipse.rse.services.ssh;bundle-version="[3.1.0,4.0.0)";resolution:=optional
+ org.eclipse.rse.services.ssh;resolution:=optional
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.dltk.core.internal.rse;x-friends:=org.eclipse.dltk.rse.ui,
org.eclipse.dltk.core.internal.rse.perfomance;x-internal:=true
