From 875f46955a58c6f2360cd0144cecbbb7a90b4b80 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Tue, 23 Jun 2015 14:03:38 +0900
Subject: [PATCH 1/2] Upgrade Lucene to version 5.2.1

Versions 5.2.0 [1] and 5.2.1 [2] contain several bugfixes and
optimizations since version 5.1.0.

[1] https://lucene.apache.org/core/5_2_0/changes/Changes.html#v5.2.0.bug_fixes
[2] https://lucene.apache.org/core/5_2_1/changes/Changes.html#v5.2.1.bug_fixes

Change-Id: I1a530ed92c5a3e7845c7aa61f54a26b0ace65e88
---
 .../com/google/gerrit/lucene/LuceneChangeIndex.java  |  3 ++-
 .../gerrit/lucene/WrappableSearcherManager.java      |  2 +-
 lib/lucene/BUCK                                      | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index 2eea15c47f..33c1e70c36 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -279,7 +279,8 @@ public class LuceneChangeIndex implements ChangeIndex {
         ChangeField.UPDATED.getName(), UninvertingReader.Type.LONG);
     return new SearcherFactory() {
       @Override
-      public IndexSearcher newSearcher(IndexReader reader) throws IOException {
+      public IndexSearcher newSearcher(IndexReader reader, IndexReader previousReader)
+          throws IOException {
         checkState(reader instanceof DirectoryReader,
             "expected DirectoryReader, found %s", reader.getClass().getName());
         return new IndexSearcher(
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/WrappableSearcherManager.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/WrappableSearcherManager.java
index 981f90922d..7bcd0a677c 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/WrappableSearcherManager.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/WrappableSearcherManager.java
@@ -187,7 +187,7 @@ final class WrappableSearcherManager extends ReferenceManager<IndexSearcher> {
     boolean success = false;
     final IndexSearcher searcher;
     try {
-      searcher = searcherFactory.newSearcher(reader);
+      searcher = searcherFactory.newSearcher(reader, null);
       // Modification for Gerrit: Allow searcherFactory to transitively wrap the
       // provided reader.
       IndexReader unwrapped = searcher.getIndexReader();
diff --git a/lib/lucene/BUCK b/lib/lucene/BUCK
index c72664d874..6ab33d963d 100644
--- a/lib/lucene/BUCK
+++ b/lib/lucene/BUCK
@@ -1,11 +1,11 @@
 include_defs('//lib/maven.defs')
 
-VERSION = '5.1.0'
+VERSION = '5.2.1'
 
 maven_jar(
   name = 'core',
   id = 'org.apache.lucene:lucene-core:' + VERSION,
-  sha1 = '93e64c67106f9a50e6ea01cfcfd6ac692ab3a41a',
+  sha1 = 'a175590aa8b04e079eb1a136fd159f9163482ba4',
   license = 'Apache2.0',
   exclude = [
     'META-INF/LICENSE.txt',
@@ -16,7 +16,7 @@ maven_jar(
 maven_jar(
   name = 'analyzers-common',
   id = 'org.apache.lucene:lucene-analyzers-common:' + VERSION,
-  sha1 = '54770d9b792536dff25ae1d70cd8af822c0079a3',
+  sha1 = '33b7cc17d5a7c939af6fe3f67563f4709926d7f5',
   license = 'Apache2.0',
   deps = [':core'],
   exclude = [
@@ -28,7 +28,7 @@ maven_jar(
 maven_jar(
   name = 'backward-codecs',
   id = 'org.apache.lucene:lucene-backward-codecs:' + VERSION,
-  sha1 = '5f0c5bb10ac3facace6b314bb02a6b572795b3c9',
+  sha1 = '603d1f06b133449272799d698e5118db65e523ba',
   license = 'Apache2.0',
   deps = [':core'],
   exclude = [
@@ -40,7 +40,7 @@ maven_jar(
 maven_jar(
   name = 'misc',
   id = 'org.apache.lucene:lucene-misc:' + VERSION,
-  sha1 = '3b700fa57f5d444da0e58cc1855042e6c5a18640',
+  sha1 = 'be0a4f0ac06f0a2fa3689b4bf6cd1fe6847f9969',
   license = 'Apache2.0',
   deps = [':core'],
   exclude = [
@@ -52,7 +52,7 @@ maven_jar(
 maven_jar(
   name = 'queryparser',
   id = 'org.apache.lucene:lucene-queryparser:' + VERSION,
-  sha1 = '53f0b3f0e700a8ec484195d3370688171e830634',
+  sha1 = '73be0a2d4ab3e6b574be1938bfb27f7f730f0ad9',
   license = 'Apache2.0',
   deps = [':core'],
   exclude = [

From 71514bca05ea00f542e1ff2aade3bed54dd98bcc Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Tue, 23 Jun 2015 20:02:34 +0900
Subject: [PATCH 2/2] Upgrade joda-time to 2.8

2.8 is not the latest (2.8.1) but this is the version used by
Elasticsearch.

Change-Id: If5b488387b1c58d0e3e374dfa6846457d7519475
---
 lib/joda/BUCK | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/joda/BUCK b/lib/joda/BUCK
index 2401870943..420a8ac25a 100644
--- a/lib/joda/BUCK
+++ b/lib/joda/BUCK
@@ -7,8 +7,8 @@ EXCLUDE = [
 
 maven_jar(
   name = 'joda-time',
-  id = 'joda-time:joda-time:2.7',
-  sha1 = '5599707a3eaad13e889f691b3af78c8c03842195',
+  id = 'joda-time:joda-time:2.8',
+  sha1 = '9f2785d7184b97d005a44241ccaf980f43b9ccdb',
   deps = [':joda-convert'],
   license = 'Apache2.0',
   exclude = EXCLUDE,