From 1fec9396b36a3edf65599205d6be3ef565cebd50 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Fri, 26 May 2017 11:20:43 +0900
Subject: [PATCH 1/2] Set version to 2.14.1-SNAPSHOT

The API includes some new classes since 2.14 and we need to be able
to build snapshot artifacts to test plugins that use the new classes.

Change-Id: Ifad31b93e5b5068c0d6952582f6882edc252e227
---
 gerrit-acceptance-framework/pom.xml | 2 +-
 gerrit-extension-api/pom.xml        | 2 +-
 gerrit-plugin-api/pom.xml           | 2 +-
 gerrit-plugin-gwtui/pom.xml         | 2 +-
 gerrit-war/pom.xml                  | 2 +-
 version.bzl                         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml
index 93140e9ef0..efb68ecb98 100644
--- a/gerrit-acceptance-framework/pom.xml
+++ b/gerrit-acceptance-framework/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-acceptance-framework</artifactId>
-  <version>2.14</version>
+  <version>2.14.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Acceptance Test Framework</name>
   <description>Framework for Gerrit's acceptance tests</description>
diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml
index 485b811159..61d0bec54c 100644
--- a/gerrit-extension-api/pom.xml
+++ b/gerrit-extension-api/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-extension-api</artifactId>
-  <version>2.14</version>
+  <version>2.14.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Extension API</name>
   <description>API for Gerrit Extensions</description>
diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml
index 8b123a91db..8964b94111 100644
--- a/gerrit-plugin-api/pom.xml
+++ b/gerrit-plugin-api/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-plugin-api</artifactId>
-  <version>2.14</version>
+  <version>2.14.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Plugin API</name>
   <description>API for Gerrit Plugins</description>
diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml
index 014270fca8..dbfda13741 100644
--- a/gerrit-plugin-gwtui/pom.xml
+++ b/gerrit-plugin-gwtui/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-plugin-gwtui</artifactId>
-  <version>2.14</version>
+  <version>2.14.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Plugin GWT UI</name>
   <description>Common Classes for Gerrit GWT UI Plugins</description>
diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml
index ed02ec0458..2dcf3c15e7 100644
--- a/gerrit-war/pom.xml
+++ b/gerrit-war/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-war</artifactId>
-  <version>2.14</version>
+  <version>2.14.1-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>Gerrit Code Review - WAR</name>
   <description>Gerrit WAR</description>
diff --git a/version.bzl b/version.bzl
index 96961f7573..7dfd46a112 100644
--- a/version.bzl
+++ b/version.bzl
@@ -2,4 +2,4 @@
 # Used by :api_install and :api_deploy targets
 # when talking to the destination repository.
 #
-GERRIT_VERSION = "2.14"
+GERRIT_VERSION = "2.14.1-SNAPSHOT"

From 7e1be009d4096ffed802442989a43621f05b3697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C5=A1a=20=C5=BDivkov?= <sasa.zivkov@sap.com>
Date: Fri, 26 May 2017 11:32:57 +0200
Subject: [PATCH 2/2] Add missing "_" to a caller of
 LuceneVersionManager.getDir

Lucene index dir is named like "<name>_<version>". All the callers
to the LuceneVersionManager.getDir were taking care to include the
underscore except the one fixed in this change.

Change-Id: Ibeea3235e70b5acaa945302d19c3ae55203b0bd9
---
 .../java/com/google/gerrit/lucene/LuceneVersionManager.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java
index f6f0c287ff..cda562bcea 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java
@@ -74,7 +74,7 @@ public class LuceneVersionManager extends AbstractVersionManager implements Life
     TreeMap<Integer, AbstractVersionManager.Version<V>> versions = new TreeMap<>();
     for (Schema<V> schema : def.getSchemas().values()) {
       // This part is Lucene-specific.
-      Path p = getDir(sitePaths, def.getName(), schema);
+      Path p = getDir(sitePaths, def.getName() + "_", schema);
       boolean isDir = Files.isDirectory(p);
       if (Files.exists(p) && !isDir) {
         log.warn("Not a directory: %s", p.toAbsolutePath());