From f26af0738a6f62d277a9e5109f3747d12ef8dc63 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 17 2019 22:01:27 +0000 Subject: Rebuild against Lucene 8 --- diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec index fb78dc6..3a6b476 100644 --- a/eclipse-pydev.spec +++ b/eclipse-pydev.spec @@ -6,7 +6,7 @@ Epoch: 1 Summary: Eclipse Python development plug-in Name: eclipse-pydev Version: 7.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: EPL-1.0 URL: http://pydev.org @@ -29,7 +29,7 @@ Patch3: fix-process-killing.patch Patch4: exclude-project-files.patch # Port to latest lucene -Patch5: lucene-71.patch +Patch5: lucene-8.patch # Improvements for pip integration Patch6: better-pip-integration.patch @@ -65,8 +65,8 @@ BuildRequires: xmlrpc-common BuildRequires: xmlrpc-client BuildRequires: xmlrpc-server BuildRequires: jython >= 2.7.1-3 -BuildRequires: lucene >= 7.1.0 -BuildRequires: lucene-analysis >= 7.1.0 +BuildRequires: lucene >= 8.0.0 +BuildRequires: lucene-analysis >= 8.0.0 # Required for symlinking into the plugin %if 0%{?fedora} @@ -167,9 +167,9 @@ ln -sf $(build-classpath xmlrpc-server) \ ln -sf $(build-classpath snakeyaml) \ plugins/org.python.pydev.shared_core/libs/snakeyaml-1.11.jar ln -sf $(build-classpath lucene/lucene-core) \ - plugins/org.python.pydev.shared_core/libs/lucene-core-7.1.0.jar + plugins/org.python.pydev.shared_core/libs/lucene-core-8.1.1.jar ln -sf $(build-classpath lucene/lucene-analyzers-common) \ - plugins/org.python.pydev.shared_core/libs/lucene-analyzers-common-7.1.0.jar + plugins/org.python.pydev.shared_core/libs/lucene-analyzers-common-8.1.1.jar # Some bundles that don't need to be dir-shaped sed -i -e '/Eclipse-BundleShape/d' \ @@ -256,6 +256,9 @@ sed -i -e '/.*\.py$/s/0644/0755/' .mfiles* %license LICENSE.txt %changelog +* Mon Jun 17 2019 Mat Booth - 1:7.2.1-2 +- Rebuild against Lucene 8 + * Sat Jun 01 2019 Mat Booth - 1:7.2.1-1 - Update to latest upstream release - Fix missing cython extension for python 2 users diff --git a/lucene-71.patch b/lucene-71.patch deleted file mode 100644 index 7fbf2c8..0000000 --- a/lucene-71.patch +++ /dev/null @@ -1,84 +0,0 @@ -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 @@ - - - -+ -+ - - -- -- - - -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.2.1.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-7.1.0.jar, -+ libs/lucene-core-7.1.0.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-7.1.0.jar,\ -+ libs/lucene-core-7.1.0.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-7.1.0.jar,\ -+ libs/lucene-analyzers-common-7.1.0.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; - - /** diff --git a/lucene-8.patch b/lucene-8.patch new file mode 100644 index 0000000..fa0025b --- /dev/null +++ b/lucene-8.patch @@ -0,0 +1,95 @@ +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 @@ + + + ++ ++ + + +- +- + + +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.2.1.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);