Address comments, clean up WORKSPACE.template

Author: jhnj

scala/BUILD

@@ -31,17 +31,17 @@ java_import(
 _declare_scalac_provider(
     name = "scala_default",
     default_classpath = [
-        "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
-        "@io_bazel_rules_scala_scala_reflect//:io_bazel_rules_scala_scala_reflect",
+        "@io_bazel_rules_scala_scala_library",
+        "@io_bazel_rules_scala_scala_reflect",
     ],
     default_macro_classpath = [
-        "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
-        "@io_bazel_rules_scala_scala_reflect//:io_bazel_rules_scala_scala_reflect",
+        "@io_bazel_rules_scala_scala_library",
+        "@io_bazel_rules_scala_scala_reflect",
     ],
     default_repl_classpath = [
-        "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
-        "@io_bazel_rules_scala_scala_reflect//:io_bazel_rules_scala_scala_reflect",
-        "@io_bazel_rules_scala_scala_compiler//:io_bazel_rules_scala_scala_compiler",
+        "@io_bazel_rules_scala_scala_library",
+        "@io_bazel_rules_scala_scala_reflect",
+        "@io_bazel_rules_scala_scala_compiler",
     ],
     scalac = "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac",
     visibility = ["//visibility:public"],

test_version/WORKSPACE.template

@@ -24,10 +24,6 @@ load("@io_bazel_rules_scala//tut_rule:tut.bzl", "tut_repositories")
 
 tut_repositories(scala_version)
 
-load("@io_bazel_rules_scala//jmh:jmh.bzl", "jmh_repositories")
-
-jmh_repositories()
-
 load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories")
 
 scala_proto_repositories(scala_version)
@@ -36,53 +32,13 @@ load("@io_bazel_rules_scala//specs2:specs2_junit.bzl", "specs2_junit_repositorie
 
 specs2_junit_repositories(scala_version)
 
-load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "scala_mvn_artifact")
+load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
 
-maven_jar(
-    name = "org_apache_commons_commons_lang_3_5",
-    artifact = "org.apache.commons:commons-lang3:3.5",
-    sha1 = "6c6c702c89bfff3cd9e80b04d668c5e190d588c6",
-)
+scala_register_toolchains()
 
 http_archive(
     name = "com_google_protobuf",
     sha256 = "118ac276be0db540ff2a89cecc5dfb9606d4d16e91cc4ea8883ae8160acb5163",
     strip_prefix = "protobuf-0456e269ee6505766474aa8d7b8bba7ac047f457",
     urls = ["https://github.com/google/protobuf/archive/0456e269ee6505766474aa8d7b8bba7ac047f457.zip"],
 )
-
-http_archive(
-    name = "com_google_protobuf_java",
-    sha256 = "118ac276be0db540ff2a89cecc5dfb9606d4d16e91cc4ea8883ae8160acb5163",
-    strip_prefix = "protobuf-0456e269ee6505766474aa8d7b8bba7ac047f457",
-    urls = ["https://github.com/google/protobuf/archive/0456e269ee6505766474aa8d7b8bba7ac047f457.zip"],
-)
-
-load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
-
-scala_register_toolchains()
-
-load("@io_bazel_rules_scala//scala:scala_maven_import_external.bzl", "scala_maven_import_external", "java_import_external")
-
-scala_maven_import_external(
-    name = "com_google_guava_guava_21_0",
-    artifact = "com.google.guava:guava:21.0",
-    jar_sha256 = "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480",
-    licenses = ["notice"],  # Apache 2.0
-    server_urls = ["https://mirror.bazel.build/repo1.maven.org/maven2"],
-)
-
-# bazel's java_import_external has been altered in rules_scala to be a macro based on jvm_import_external
-# in order to allow for other jvm-language imports (e.g. scala_import)
-# the 3rd-party dependency below is using the java_import_external macro
-# in order to make sure no regression with the original java_import_external
-load("@io_bazel_rules_scala//scala:scala_maven_import_external.bzl", "java_import_external")
-
-java_import_external(
-    name = "org_apache_commons_commons_lang_3_5_without_file",
-    generated_linkable_rule_name = "linkable_org_apache_commons_commons_lang_3_5_without_file",
-    jar_sha256 = "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c",
-    jar_urls = ["http://central.maven.org/maven2/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"],
-    licenses = ["notice"],  # Apache 2.0
-    neverlink = True,
-)