From f69f008bfe06bbf9d3701dab6ce0866cd0f6d567 Mon Sep 17 00:00:00 2001 From: Ivan Subotic <400790+subotic@users.noreply.github.com> Date: Fri, 23 Apr 2021 14:06:52 +0200 Subject: [PATCH] chore(deps): bump versions (DSP-1569) (#1849) --- Makefile | 4 ++++ WORKSPACE | 36 +++++------------------------------- third_party/dependencies.bzl | 2 +- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index d38184ca13..685147d89c 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,10 @@ docs-clean: ## cleans the project directory build: ## build all targets (excluding docs) @bazel build //... +.PHOBY: check-for-outdated-deps +check-for-outdated-deps: ## check for outdated maven dependencies + @bazel run @maven//:outdated + ################################# # Docker targets ################################# diff --git a/WORKSPACE b/WORKSPACE index 35dfd69f47..f91be752b7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -13,8 +13,8 @@ http_archive( ) # download rules_scala repository -rules_scala_version="8866f55712b30bbb96335cc11bc5ae5aad5cf8d4" # 18.11.2020 -rules_scala_version_sha256="cdc13aba7f0f89ae52c9c50394a10f24ac0e18923108598ac9dafce5be6a789a" +rules_scala_version="0ac75d3a044b8e316d1b11b90a7d044685bd72e8" # 22.04.2021 +rules_scala_version_sha256="7624c95c19b60df943dbde90c54d09ecad9aca9432b1211da8352f131776ac36" http_archive( name = "io_bazel_rules_scala", strip_prefix = "rules_scala-%s" % rules_scala_version, @@ -27,7 +27,7 @@ http_archive( # 2.12 is a default version, other versions can be use by passing them explicitly: # scala_config(scala_version = "2.11.12") load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "2.12.11") +scala_config(scala_version = "2.12.13") # register default and our custom scala toolchain load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains") @@ -59,38 +59,12 @@ http_archive( load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() - -# -# download rules_webtesting (for browser tests of salsah1) -# -rules_webtesting_release = "0.3.3" -rules_webtesting_release_sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3" -http_archive( - name = "io_bazel_rules_webtesting", - sha256 = rules_webtesting_release_sha256, - urls = [ - "https://github.com/bazelbuild/rules_webtesting/releases/download/%s/rules_webtesting.tar.gz" % rules_webtesting_release, - ], -) - -load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories") - -web_test_repositories() - -load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories") - -browser_repositories(chromium=True, firefox=True) - -load("@io_bazel_rules_webtesting//web:java_repositories.bzl", "java_repositories") - -java_repositories() - # # download rules_jvm_external used for maven dependency resolution # defined in the third_party sub-folder # -rules_jvm_external_version = "3.3" # 7.07.2020 -rules_jvm_external_version_sha256 = "d85951a92c0908c80bd8551002d66cb23c3434409c814179c0ff026b53544dab" +rules_jvm_external_version = "4.0" # 6.01.2021 +rules_jvm_external_version_sha256 = "31701ad93dbfe544d597dbe62c9a1fdd76d81d8a9150c2bf1ecf928ecdf97169" http_archive( name = "rules_jvm_external", diff --git a/third_party/dependencies.bzl b/third_party/dependencies.bzl index 8bab8aac64..532ec06a1e 100644 --- a/third_party/dependencies.bzl +++ b/third_party/dependencies.bzl @@ -129,7 +129,7 @@ def dependencies(): "org.scalatest:scalatest-matchers-core_2.12:3.2.2", "org.scalatest:scalatest-shouldmatchers_2.12:3.2.2", "org.scalatest:scalatest-compatible:3.2.2", - "org.testcontainers:testcontainers:1.15.1", + "org.testcontainers:testcontainers:1.15.3", "junit:junit:4.13", "io.gatling.highcharts:gatling-charts-highcharts:3.2.1", "io.gatling:gatling-test-framework:3.2.1",