Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade jackson-core to 2.10.2
  Bazel: Force sourcemaps inlining in polymer bundler

Change-Id: I6aa2ae480b808f268034e76b363b985a7def2b96
This commit is contained in:
Marco Miller
2020-01-07 17:47:25 -05:00
2 changed files with 3 additions and 2 deletions

View File

@@ -316,6 +316,7 @@ def _bundle_impl(ctx):
"$p/" + ctx.file._bundler_archive.path,
"--inline-scripts",
"--inline-css",
"--sourcemaps",
"--strip-comments",
"--out-file",
"$p/" + bundled.path,

View File

@@ -100,8 +100,8 @@ def declare_nongoogle_deps():
maven_jar(
name = "jackson-core",
artifact = "com.fasterxml.jackson.core:jackson-core:2.10.1",
sha1 = "2c8b5e26ba40e5f91eb37a24075a2028b402c5f9",
artifact = "com.fasterxml.jackson.core:jackson-core:2.10.2",
sha1 = "73d4322a6bda684f676a2b5fe918361c4e5c7cca",
)
# Test-only dependencies below.