Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I032384cac9023c0f8b6d18c5e8130897225dacf6
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index ce4baf9..c8a4185 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -196,7 +196,8 @@
             src.add(m.group(1))
             # Exceptions: both source and lib
             if p.endswith('libquery_parser.jar') or \
-               p.endswith('libgerrit-prolog-common.jar'):
+               p.endswith('libgerrit-prolog-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: