Bug 545396 - Update DLTK to Lucene 8.0
Update orbit to 2019.06 M2 in target platform to get the latest
lucene bundles
Change-Id: If9b2a3035c0f4c7ef2138c737066a101b6d7812f
Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/core/plugins/org.eclipse.dltk.core.index.lucene/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.index.lucene/META-INF/MANIFEST.MF
index 4e8e5cb..3992b4b 100644
--- a/core/plugins/org.eclipse.dltk.core.index.lucene/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core.index.lucene/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.dltk.core,
- org.apache.lucene.core;bundle-version="[7.5.0,7.6.0)",
- org.apache.lucene.misc;bundle-version="[7.5.0,7.6.0)",
- org.apache.lucene.analyzers-common;bundle-version="[7.5.0,7.6.0)"
+ org.apache.lucene.core;bundle-version="[8.0.0,8.1.0)",
+ org.apache.lucene.misc;bundle-version="[8.0.0,8.1.0)",
+ org.apache.lucene.analyzers-common;bundle-version="[8.0.0,8.1.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.dltk.core.index.lucene
diff --git a/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/BitFlagsQuery.java b/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/BitFlagsQuery.java
index f97fe26..37cf586 100644
--- a/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/BitFlagsQuery.java
+++ b/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/BitFlagsQuery.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Zend Technologies and others.
+ * Copyright (c) 2016, 2019 Zend Technologies and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@@ -21,6 +21,7 @@
import org.apache.lucene.search.ConstantScoreWeight;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TwoPhaseIterator;
import org.apache.lucene.search.Weight;
@@ -75,7 +76,7 @@
}
@Override
- public Weight createWeight(IndexSearcher searcher, boolean needsScores,
+ public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode,
float boost) throws IOException {
return new ConstantScoreWeight(this, 10) {
@@ -106,7 +107,7 @@
return 2;
}
};
- return new ConstantScoreScorer(this, 10, iterator);
+ return new ConstantScoreScorer(this, 10, scoreMode, iterator);
}
@Override
diff --git a/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneIndexer.java b/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneIndexer.java
index 98b7b4a..4dafa0e 100644
--- a/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneIndexer.java
+++ b/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneIndexer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Zend Technologies and others.
+ * Copyright (c) 2016, 2019 Zend Technologies and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@@ -25,7 +25,8 @@
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Scorable;
+import org.apache.lucene.search.ScoreMode;
import org.eclipse.core.runtime.IPath;
import org.eclipse.dltk.core.DLTKLanguageManager;
import org.eclipse.dltk.core.IDLTKLanguageToolkit;
@@ -57,8 +58,8 @@
}
@Override
- public boolean needsScores() {
- return false;
+ public ScoreMode scoreMode() {
+ return ScoreMode.COMPLETE_NO_SCORES;
}
@Override
@@ -71,7 +72,7 @@
.getBinaryDocValues(IndexFields.F_PATH);
return new LeafCollector() {
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorable scorable) throws IOException {
}
@Override
diff --git a/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneSearchEngine.java b/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneSearchEngine.java
index 38b5aba..11395e3 100644
--- a/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneSearchEngine.java
+++ b/core/plugins/org.eclipse.dltk.core.index.lucene/src/org/eclipse/dltk/internal/core/index/lucene/LuceneSearchEngine.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Zend Technologies and others.
+ * Copyright (c) 2016, 2019 Zend Technologies and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@@ -47,7 +47,8 @@
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Scorable;
+import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.SearcherManager;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.WildcardQuery;
@@ -130,8 +131,8 @@
}
@Override
- public boolean needsScores() {
- return false;
+ public ScoreMode scoreMode() {
+ return ScoreMode.COMPLETE_NO_SCORES;
}
@Override
@@ -155,7 +156,7 @@
return new LeafCollector() {
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorable scorable) throws IOException {
}
@Override
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 a279de8..b96e937 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="org.eclipse.dltk.core.targetplatform" sequenceNumber="20">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="org.eclipse.dltk.core.targetplatform" sequenceNumber="21">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.antlr.runtime" version="3.0.0.v200803061811"/>
@@ -8,13 +8,13 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<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="7.5.0.v20181003-1532"/>
- <unit id="org.apache.lucene.analyzers-common.source" version="7.5.0.v20181003-1532"/>
- <unit id="org.apache.lucene.core" version="7.5.0.v20181003-1532"/>
- <unit id="org.apache.lucene.core.source" version="7.5.0.v20181003-1532"/>
- <unit id="org.apache.lucene.misc" version="7.5.0.v20181003-1532"/>
- <unit id="org.apache.lucene.misc.source" version="7.5.0.v20181003-1532"/>
- <!-- DLTK depends on Lucene 7.5, but Mylyn 3.24 depends on Lucene 6.1 -->
+ <unit id="org.apache.lucene.analyzers-common" version="8.0.0.v20190404-1858"/>
+ <unit id="org.apache.lucene.analyzers-common.source" version="8.0.0.v20190404-1858"/>
+ <unit id="org.apache.lucene.core" version="8.0.0.v20190404-1858"/>
+ <unit id="org.apache.lucene.core.source" version="8.0.0.v20190404-1858"/>
+ <unit id="org.apache.lucene.misc" version="8.0.0.v20190418-1455"/>
+ <unit id="org.apache.lucene.misc.source" version="8.0.0.v20190418-1455"/>
+ <!-- DLTK depends on Lucene 8.0, but Mylyn 3.24 depends on Lucene 6.1 -->
<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"/>
@@ -32,7 +32,7 @@
<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
<unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20190501151401/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"/>
@@ -46,4 +46,4 @@
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-</target>
\ No newline at end of file
+</target>
