opendev/gerrit
Code Issues Proposed changes

Merge changes I8075ae70,Iad6e8f8b

Browse Source 
* changes:
  QueryDocumentationFilter: Move it out from rpc package
  Bazel: Fix elasticsearch to depend on reviewdb:server
This commit is contained in:
David Pursehouse
2017-07-31 07:41:28 +00:00
committed by Gerrit Code Review
parent 9a538ff371 5537966a70
commit 975d87e54b
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-elasticsearch/BUILD
View File

@@ -5,7 +5,6 @@ java_library(
deps = [ deps = [
"//gerrit-antlr:query_exception", "//gerrit-antlr:query_exception",
"//gerrit-extension-api:api", "//gerrit-extension-api:api",
"//gerrit-reviewdb:client",
"//gerrit-reviewdb:server", "//gerrit-reviewdb:server",
"//gerrit-server:server", "//gerrit-server:server",
"//lib:gson", "//lib:gson",
@@ -36,7 +35,7 @@ java_library(
deps = [ deps = [
":elasticsearch", ":elasticsearch",
"//gerrit-extension-api:api", "//gerrit-extension-api:api",
"//gerrit-reviewdb:client", "//gerrit-reviewdb:server",
"//gerrit-server:server", "//gerrit-server:server",
"//lib:gson", "//lib:gson",
"//lib:guava", "//lib:guava",

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/doc/QueryDocumentationFilter.java → gerrit-httpd/src/main/java/com/google/gerrit/httpd/QueryDocumentationFilter.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package com.google.gerrit.httpd.rpc.doc; package com.google.gerrit.httpd;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableListMultimap;

1
gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
View File

@@ -30,7 +30,6 @@ import com.google.gerrit.httpd.restapi.ChangesRestApiServlet;
import com.google.gerrit.httpd.restapi.ConfigRestApiServlet; import com.google.gerrit.httpd.restapi.ConfigRestApiServlet;
import com.google.gerrit.httpd.restapi.GroupsRestApiServlet; import com.google.gerrit.httpd.restapi.GroupsRestApiServlet;
import com.google.gerrit.httpd.restapi.ProjectsRestApiServlet; import com.google.gerrit.httpd.restapi.ProjectsRestApiServlet;
import com.google.gerrit.httpd.rpc.doc.QueryDocumentationFilter;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.AuthConfig;