Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Adapt Eclipse project generation for Bazel 0.25

Change-Id: I03ab4b39f5255cfb1e2bf7043a55b9a526d6012b
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index c9f382b..b9179ef 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -154,7 +154,8 @@
       src.add(m.group(1))
       # Exceptions: both source and lib
       if p.endswith('libquery_parser.jar') or \
-         p.endswith('libprolog-common.jar'):
+         p.endswith('libprolog-common.jar') or \
+         p.endswith('lucene-core-and-backward-codecs__merged.jar'):
         lib.add(p)
       # JGit dependency from external repository
       if 'gerrit-' not in p and 'jgit' in p: