Update bazel to 2.2 + update config (#798)

Newer bazel does not support `maven_jar` rule anymore...

.travis.yml

@@ -195,8 +195,7 @@ matrix:
 
     - os: osx
       env: BUILD_SYSTEM=bazel
-      # Latest image with Java 1.8 (required to install Bazel).
+      osx_image: xcode11.3
-      osx_image: xcode9.3
       language: java
 
 before_install:

java/WORKSPACE

@@ -5,12 +5,24 @@ local_repository(
     path = "..",
 )
 
-maven_jar(
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
-    name = "junit_junit",
+
-    artifact = "junit:junit:4.12",
+RULES_JVM_EXTERNAL_TAG = "3.0"
+RULES_JVM_EXTERNAL_SHA = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a"
+
+http_archive(
+    name = "rules_jvm_external",
+    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
+    sha256 = RULES_JVM_EXTERNAL_SHA,
+    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
 )
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+load("@rules_jvm_external//:defs.bzl", "maven_install")
+
+maven_install(
+    artifacts = ["junit:junit:4.12"],
+    repositories = ["https://repo1.maven.org/maven2"],
+)
 
 http_file(
     name = "openjdk_jni_h",

java/org/brotli/dec/BUILD

@@ -7,7 +7,7 @@ licenses(["notice"])  # MIT
 
 TEST_DEPS = [
     ":dec",
-    "@junit_junit//jar",
+    "@maven//:junit_junit",
 ]
 
 java_library(

java/org/brotli/wrapper/common/BUILD

@@ -30,7 +30,7 @@ java_library(
         "//org/brotli/dec",
         "//org/brotli/integration:brotli_jni_test_base",
         "//org/brotli/wrapper/dec",
-        "@junit_junit//jar",
+        "@maven//:junit_junit",
     ],
 )
 

java/org/brotli/wrapper/dec/BUILD

@@ -24,7 +24,7 @@ java_library(
         ":dec",
         "//org/brotli/integration:brotli_jni_test_base",
         "//org/brotli/integration:bundle_helper",
-        "@junit_junit//jar",
+        "@maven//:junit_junit",
     ],
 )
 

java/org/brotli/wrapper/enc/BUILD

@@ -30,7 +30,7 @@ java_library(
         "//org/brotli/integration:brotli_jni_test_base",
         "//org/brotli/integration:bundle_helper",
         "//org/brotli/wrapper/dec",
-        "@junit_junit//jar",
+        "@maven//:junit_junit",
     ],
 )
 

scripts/.travis.sh

@@ -6,7 +6,7 @@ case "$1" in
     "install")
 	case "${TRAVIS_OS_NAME}" in
 	    "osx")
-		brew update
+		brew update >/dev/null
 		brew install binutils
 
 		case "${CC}" in
@@ -17,8 +17,8 @@ case "$1" in
 
 		case "${BUILD_SYSTEM}" in
 		    "bazel")
+			brew cask install homebrew/cask-versions/adoptopenjdk8
 			brew install bazel
-			brew upgrade python
 			;;
 		esac
 		;;

scripts/appveyor.yml

@@ -54,7 +54,7 @@ install:
     )
   )
 - IF "%BUILD_SYSTEM%"=="bazel" (
-    appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.18.0/bazel-0.18.0-windows-x86_64.exe -FileName bazel.exe
+    appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-windows-x86_64.exe -FileName bazel.exe
   )
 
 before_build: