opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  ElasticContainer: Use Elasticsearch 6.4.1 for V6_4 tests
  AbstractDaemonTest: Don't delete common server path too early
  Fix toolchain definitions for bazel 0.17.1
  Bazel: Bump baseline to 0.17.1

Change-Id: Ied727b76e0bc13ab8cb8d20372514edacc56e70f
This commit is contained in:
David Pursehouse 2018-09-19 14:17:05 +09:00
commit edb53f796a
3 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WORKSPACE
View File

@ -30,7 +30,7 @@ http_file(
load("@bazel_skylib//:lib.bzl", "versions") load("@bazel_skylib//:lib.bzl", "versions")
versions.check(minimum_bazel_version = "0.14.0") versions.check(minimum_bazel_version = "0.17.1")
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories") load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@ -51,7 +51,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
case V6_3: case V6_3:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2"; return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2";
case V6_4: case V6_4:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.0"; return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.1";
} }
throw new IllegalStateException("No tests for version: " + version.name()); throw new IllegalStateException("No tests for version: " + version.name());
} }

44
tools/BUILD
View File

@ -1,4 +1,8 @@
load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain") load(
"@bazel_tools//tools/jdk:default_java_toolchain.bzl",
"JDK9_JVM_OPTS",
"default_java_toolchain",
)
py_binary( py_binary(
name = "merge_jars", name = "merge_jars",
@ -7,44 +11,10 @@ py_binary(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
# TODO(davido): remove this when minimum suported Bazel version >= 0.17
# Copied from tools/jdk/default_java_toolchain.bzl to make Bazel 0.16
# and later Bazel released to work as expected. See this issue for context:
# https://github.com/bazelbuild/bazel/issues/6009
JDK9_JVM_OPTS = [
# Allow JavaBuilder to access internal javac APIs.
"--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
# override the javac in the JDK.
"--patch-module=java.compiler=$(location @bazel_tools//third_party/java/jdk/langtools:java_compiler_jar)",
"--patch-module=jdk.compiler=$(location @bazel_tools//third_party/java/jdk/langtools:jdk_compiler_jar)",
# quiet warnings from com.google.protobuf.UnsafeUtil,
# see: https://github.com/google/protobuf/issues/3781
"--add-opens=java.base/java.nio=ALL-UNNAMED",
]
# See https://github.com/bazelbuild/bazel/issues/3427 for more context
default_java_toolchain(
name = "error_prone_warnings_toolchain_bazel_0.16",
bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath.jar"],
jvm_opts = JDK9_JVM_OPTS,
package_configuration = [
":error_prone",
],
visibility = ["//visibility:public"],
)
default_java_toolchain( default_java_toolchain(
name = "error_prone_warnings_toolchain", name = "error_prone_warnings_toolchain",
bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath.jar"], bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath9.jar"],
jvm_opts = JDK9_JVM_OPTS,
package_configuration = [ package_configuration = [
":error_prone", ":error_prone",
], ],