From 42938ea780f8c40e762debc7551bb1e91bdb96a5 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 15 Jan 2020 17:38:20 +0100 Subject: [PATCH 1/2] use https for maven CHANGELOG_BEGIN CHANGELOG_END --- bazel_tools/scala-https.patch | 125 ++++++++++++++++++++++++++++++++++ deps.bzl | 1 + 2 files changed, 126 insertions(+) create mode 100644 bazel_tools/scala-https.patch diff --git a/bazel_tools/scala-https.patch b/bazel_tools/scala-https.patch new file mode 100644 index 000000000000..3e9997a9002e --- /dev/null +++ b/bazel_tools/scala-https.patch @@ -0,0 +1,125 @@ +commit c8644cdd1d6c02fbd115b4378e2bad33faf9f725 +Author: Andreas Herrmann +Date: Wed Jan 15 17:35:23 2020 +0100 + + Use https to access central.maven.org + + See https://support.sonatype.com/hc/en-us/articles/360041287334 + +diff --git a/WORKSPACE b/WORKSPACE +index 4422756..1d27936 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -157,7 +157,7 @@ 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"], ++ jar_urls = ["https://central.maven.org/maven2/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"], + licenses = ["notice"], # Apache 2.0 + neverlink = True, + ) +diff --git a/jmh/jmh.bzl b/jmh/jmh.bzl +index 1eb12bb..deefd58 100644 +--- a/jmh/jmh.bzl ++++ b/jmh/jmh.bzl +@@ -4,7 +4,7 @@ load( + _scala_maven_import_external = "scala_maven_import_external", + ) + +-def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]): ++def jmh_repositories(maven_servers = ["https://central.maven.org/maven2"]): + _scala_maven_import_external( + name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_core", + artifact = "org.openjdk.jmh:jmh-core:1.20", +diff --git a/junit/junit.bzl b/junit/junit.bzl +index ad97ff1..87a4ede 100644 +--- a/junit/junit.bzl ++++ b/junit/junit.bzl +@@ -3,7 +3,7 @@ load( + _scala_maven_import_external = "scala_maven_import_external", + ) + +-def junit_repositories(maven_servers = ["http://central.maven.org/maven2"]): ++def junit_repositories(maven_servers = ["https://central.maven.org/maven2"]): + _scala_maven_import_external( + name = "io_bazel_rules_scala_junit_junit", + artifact = "junit:junit:4.12", +diff --git a/scala/private/macros/scala_repositories.bzl b/scala/private/macros/scala_repositories.bzl +index 9266312..4e2be92 100644 +--- a/scala/private/macros/scala_repositories.bzl ++++ b/scala/private/macros/scala_repositories.bzl +@@ -56,7 +56,7 @@ def scala_repositories( + _default_scala_version(), + _default_scala_version_jar_shas(), + ), +- maven_servers = ["http://central.maven.org/maven2"], ++ maven_servers = ["https://central.maven.org/maven2"], + scala_extra_jars = _default_scala_extra_jars()): + (scala_version, scala_version_jar_shas) = scala_version_shas + major_version = _extract_major_version(scala_version) +diff --git a/scala_proto/private/scala_proto_default_repositories.bzl b/scala_proto/private/scala_proto_default_repositories.bzl +index 2b95ce9..f94290a 100644 +--- a/scala_proto/private/scala_proto_default_repositories.bzl ++++ b/scala_proto/private/scala_proto_default_repositories.bzl +@@ -11,7 +11,7 @@ load( + + def scala_proto_default_repositories( + scala_version = _default_scala_version(), +- maven_servers = ["http://central.maven.org/maven2"]): ++ maven_servers = ["https://central.maven.org/maven2"]): + major_version = _extract_major_version(scala_version) + + scala_jar_shas = { +diff --git a/scala_proto/scala_proto.bzl b/scala_proto/scala_proto.bzl +index 88a62c2..a0e22e0 100644 +--- a/scala_proto/scala_proto.bzl ++++ b/scala_proto/scala_proto.bzl +@@ -29,7 +29,7 @@ def register_default_proto_dependencies(): + + def scala_proto_repositories( + scala_version = _default_scala_version(), +- maven_servers = ["http://central.maven.org/maven2"]): ++ maven_servers = ["https://central.maven.org/maven2"]): + ret = scala_proto_default_repositories(scala_version, maven_servers) + register_default_proto_dependencies() + return ret +diff --git a/specs2/specs2.bzl b/specs2/specs2.bzl +index 769a4d5..5b698b8 100644 +--- a/specs2/specs2.bzl ++++ b/specs2/specs2.bzl +@@ -14,7 +14,7 @@ def specs2_version(): + + def specs2_repositories( + scala_version = _default_scala_version(), +- maven_servers = ["http://central.maven.org/maven2"]): ++ maven_servers = ["https://central.maven.org/maven2"]): + major_version = _extract_major_version(scala_version) + + scala_jar_shas = { +diff --git a/specs2/specs2_junit.bzl b/specs2/specs2_junit.bzl +index 813f329..66cf781 100644 +--- a/specs2/specs2_junit.bzl ++++ b/specs2/specs2_junit.bzl +@@ -18,7 +18,7 @@ load( + + def specs2_junit_repositories( + scala_version = _default_scala_version(), +- maven_servers = ["http://central.maven.org/maven2"]): ++ maven_servers = ["https://central.maven.org/maven2"]): + major_version = _extract_major_version(scala_version) + + specs2_repositories(scala_version, maven_servers) +diff --git a/twitter_scrooge/twitter_scrooge.bzl b/twitter_scrooge/twitter_scrooge.bzl +index 79d1573..90ea005 100644 +--- a/twitter_scrooge/twitter_scrooge.bzl ++++ b/twitter_scrooge/twitter_scrooge.bzl +@@ -23,7 +23,7 @@ _jar_extension = ".jar" + + def twitter_scrooge( + scala_version = _default_scala_version(), +- maven_servers = ["http://central.maven.org/maven2"]): ++ maven_servers = ["https://central.maven.org/maven2"]): + major_version = _extract_major_version(scala_version) + + _scala_maven_import_external( diff --git a/deps.bzl b/deps.bzl index 68a36bf99489..c953844611da 100644 --- a/deps.bzl +++ b/deps.bzl @@ -121,6 +121,7 @@ def daml_deps(): sha256 = "37eb013ea3e6a940da70df43fe2dd6f423d1ac0849042aa586f9ac157321018d", patches = [ "@com_github_digital_asset_daml//bazel_tools:scala-escape-jvmflags.patch", + "@com_github_digital_asset_daml//bazel_tools:scala-https.patch", ], patch_args = ["-p1"], ) From 60fe7baa549e5048bcbeb4d5fb77f7fa8bd2058c Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 15 Jan 2020 18:19:22 +0100 Subject: [PATCH 2/2] central.maven.org --> repo.maven.apache.org --- bazel_tools/scala-https.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bazel_tools/scala-https.patch b/bazel_tools/scala-https.patch index 3e9997a9002e..17d0ab8e1ff7 100644 --- a/bazel_tools/scala-https.patch +++ b/bazel_tools/scala-https.patch @@ -15,7 +15,7 @@ index 4422756..1d27936 100644 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"], -+ jar_urls = ["https://central.maven.org/maven2/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"], ++ jar_urls = ["https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"], licenses = ["notice"], # Apache 2.0 neverlink = True, ) @@ -28,7 +28,7 @@ index 1eb12bb..deefd58 100644 ) -def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]): -+def jmh_repositories(maven_servers = ["https://central.maven.org/maven2"]): ++def jmh_repositories(maven_servers = ["https://repo.maven.apache.org/maven2"]): _scala_maven_import_external( name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_core", artifact = "org.openjdk.jmh:jmh-core:1.20", @@ -41,7 +41,7 @@ index ad97ff1..87a4ede 100644 ) -def junit_repositories(maven_servers = ["http://central.maven.org/maven2"]): -+def junit_repositories(maven_servers = ["https://central.maven.org/maven2"]): ++def junit_repositories(maven_servers = ["https://repo.maven.apache.org/maven2"]): _scala_maven_import_external( name = "io_bazel_rules_scala_junit_junit", artifact = "junit:junit:4.12", @@ -54,7 +54,7 @@ index 9266312..4e2be92 100644 _default_scala_version_jar_shas(), ), - maven_servers = ["http://central.maven.org/maven2"], -+ maven_servers = ["https://central.maven.org/maven2"], ++ maven_servers = ["https://repo.maven.apache.org/maven2"], scala_extra_jars = _default_scala_extra_jars()): (scala_version, scala_version_jar_shas) = scala_version_shas major_version = _extract_major_version(scala_version) @@ -67,7 +67,7 @@ index 2b95ce9..f94290a 100644 def scala_proto_default_repositories( scala_version = _default_scala_version(), - maven_servers = ["http://central.maven.org/maven2"]): -+ maven_servers = ["https://central.maven.org/maven2"]): ++ maven_servers = ["https://repo.maven.apache.org/maven2"]): major_version = _extract_major_version(scala_version) scala_jar_shas = { @@ -80,7 +80,7 @@ index 88a62c2..a0e22e0 100644 def scala_proto_repositories( scala_version = _default_scala_version(), - maven_servers = ["http://central.maven.org/maven2"]): -+ maven_servers = ["https://central.maven.org/maven2"]): ++ maven_servers = ["https://repo.maven.apache.org/maven2"]): ret = scala_proto_default_repositories(scala_version, maven_servers) register_default_proto_dependencies() return ret @@ -93,7 +93,7 @@ index 769a4d5..5b698b8 100644 def specs2_repositories( scala_version = _default_scala_version(), - maven_servers = ["http://central.maven.org/maven2"]): -+ maven_servers = ["https://central.maven.org/maven2"]): ++ maven_servers = ["https://repo.maven.apache.org/maven2"]): major_version = _extract_major_version(scala_version) scala_jar_shas = { @@ -106,7 +106,7 @@ index 813f329..66cf781 100644 def specs2_junit_repositories( scala_version = _default_scala_version(), - maven_servers = ["http://central.maven.org/maven2"]): -+ maven_servers = ["https://central.maven.org/maven2"]): ++ maven_servers = ["https://repo.maven.apache.org/maven2"]): major_version = _extract_major_version(scala_version) specs2_repositories(scala_version, maven_servers) @@ -119,7 +119,7 @@ index 79d1573..90ea005 100644 def twitter_scrooge( scala_version = _default_scala_version(), - maven_servers = ["http://central.maven.org/maven2"]): -+ maven_servers = ["https://central.maven.org/maven2"]): ++ maven_servers = ["https://repo.maven.apache.org/maven2"]): major_version = _extract_major_version(scala_version) _scala_maven_import_external(