diff --git a/plugins/org.python.pydev.shared_core/.classpath b/plugins/org.python.pydev.shared_core/.classpath
index f8225c656..4a056b065 100644
--- a/plugins/org.python.pydev.shared_core/.classpath
+++ b/plugins/org.python.pydev.shared_core/.classpath
@@ -3,9 +3,9 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="tests"/>
<classpathentry exported="true" kind="lib" path="libs/snakeyaml-1.11.jar"/>
+ <classpathentry kind="lib" path="libs/lucene-analyzers-common-8.1.1.jar"/>
+ <classpathentry kind="lib" path="libs/lucene-core-8.1.1.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="lib" path="libs/lucene-analyzers-common-6.1.0.jar"/>
- <classpathentry kind="lib" path="libs/lucene-core-6.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.python.pydev.shared_core/META-INF/MANIFEST.MF b/plugins/org.python.pydev.shared_core/META-INF/MANIFEST.MF
index 9b3da3551..7555a8e4d 100644
--- a/plugins/org.python.pydev.shared_core/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.shared_core/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.python.pydev.shared_core;singleton:=true
Bundle-Version: 7.3.0.qualifier
Bundle-ClassPath: shared_core.jar,
libs/snakeyaml-1.11.jar,
- libs/lucene-analyzers-common-6.1.0.jar,
- libs/lucene-core-6.1.0.jar
+ libs/lucene-analyzers-common-8.1.1.jar,
+ libs/lucene-core-8.1.1.jar
Bundle-Activator: org.python.pydev.shared_core.SharedCorePlugin
Eclipse-BundleShape: dir
Require-Bundle: org.eclipse.core.runtime,
@@ -78,8 +78,6 @@ Export-Package: org.apache.lucene,
org.apache.lucene.codecs.blocktree,
org.apache.lucene.codecs.compressing,
org.apache.lucene.codecs.lucene50,
- org.apache.lucene.codecs.lucene53,
- org.apache.lucene.codecs.lucene54,
org.apache.lucene.codecs.lucene60,
org.apache.lucene.codecs.perfield,
org.apache.lucene.collation,
diff --git a/plugins/org.python.pydev.shared_core/build.properties b/plugins/org.python.pydev.shared_core/build.properties
index 8af3a0600..e41f4b4d2 100644
--- a/plugins/org.python.pydev.shared_core/build.properties
+++ b/plugins/org.python.pydev.shared_core/build.properties
@@ -2,11 +2,11 @@ bin.includes = shared_core.jar,\
META-INF/,\
LICENSE.txt,\
libs/,\
- libs/lucene-analyzers-common-6.1.0.jar,\
- libs/lucene-core-6.1.0.jar
+ libs/lucene-analyzers-common-8.1.1.jar,\
+ libs/lucene-core-8.1.1.jar
jars.compile.order = shared_core.jar
source.shared_core.jar = src/
output.shared_core.jar = bin/
jars.extra.classpath = libs/snakeyaml-1.11.jar,\
- libs/lucene-core-6.1.0.jar,\
- libs/lucene-analyzers-common-6.1.0.jar
+ libs/lucene-core-8.1.1.jar,\
+ libs/lucene-analyzers-common-8.1.1.jar
diff --git a/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/CodeAnalyzer.java b/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/CodeAnalyzer.java
index ae688d4a6..d8b05f20a 100644
--- a/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/CodeAnalyzer.java
+++ b/plugins/org.python.pydev.shared_core/src/org/python/pydev/shared_core/index/CodeAnalyzer.java
@@ -1,5 +1,5 @@
/******************************************************************************
-* Copyright (C) 2015 Fabio Zadrozny and others
+* Copyright (C) 2015, 2018 Fabio Zadrozny and others
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -15,11 +15,11 @@
import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.StopFilter;
-import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.CharTokenizer;
/**
@@ -56,10 +56,6 @@
return Character.isJavaIdentifierPart(c);
}
- @Override
- protected int normalize(int c) {
- return Character.toLowerCase(c);
- }
};
TokenFilter tok = new LowerCaseFilter(src);