Skip to content
Permalink
Browse files
chore: bump scala to 2.13 (#1851)
  • Loading branch information
subotic committed May 5, 2021
1 parent 84f7c14 commit 5feb9155647f02d8a7b7f57ba7d8d06352093cd9
Showing with 603 additions and 621 deletions.
  1. +1 −1 WORKSPACE
  2. +180 −180 test_data/metadataE2EV2/metadata-flat.jsonld
  3. +53 −54 third_party/dependencies.bzl
  4. +2 −2 third_party/versions.bzl
  5. +40 −40 webapi/BUILD.bazel
  6. +3 −3 webapi/src/main/scala/org/knora/webapi/BUILD.bazel
  7. +13 −13 webapi/src/main/scala/org/knora/webapi/app/BUILD.bazel
  8. +7 −7 webapi/src/main/scala/org/knora/webapi/contributors/BUILD.bazel
  9. +2 −2 webapi/src/main/scala/org/knora/webapi/core/BUILD.bazel
  10. +1 −1 webapi/src/main/scala/org/knora/webapi/exceptions/BUILD.bazel
  11. +3 −3 webapi/src/main/scala/org/knora/webapi/feature/BUILD.bazel
  12. +4 −4 webapi/src/main/scala/org/knora/webapi/http/directives/BUILD.bazel
  13. +7 −7 webapi/src/main/scala/org/knora/webapi/http/handler/BUILD.bazel
  14. +2 −2 webapi/src/main/scala/org/knora/webapi/http/status/BUILD.bazel
  15. +3 −3 webapi/src/main/scala/org/knora/webapi/http/version/BUILD.bazel
  16. +6 −6 webapi/src/main/scala/org/knora/webapi/instrumentation/BUILD.bazel
  17. +2 −2 webapi/src/main/scala/org/knora/webapi/instrumentation/InstrumentationSupport.scala
  18. +10 −10 webapi/src/main/scala/org/knora/webapi/messages/BUILD.bazel
  19. +23 −24 webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala
  20. +7 −17 webapi/src/main/scala/org/knora/webapi/messages/util/ErrorHandlingMap.scala
  21. +1 −1 webapi/src/main/scala/org/knora/webapi/messages/util/FakeTriplestore.scala
  22. +1 −1 webapi/src/main/scala/org/knora/webapi/messages/util/PermissionUtilADM.scala
  23. +1 −1 webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala
  24. +3 −3 webapi/src/main/scala/org/knora/webapi/messages/util/rdf/jenaimpl/JenaModel.scala
  25. +3 −3 webapi/src/main/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/RDF4JModel.scala
  26. +10 −7 webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala
  27. +10 −8 ...ala/org/knora/webapi/messages/util/search/gravsearch/types/IntermediateTypeInspectionResult.scala
  28. +6 −5 webapi/src/main/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtil.scala
  29. +4 −6 ...i/src/main/scala/org/knora/webapi/messages/v1/responder/resourcemessages/ResourceMessagesV1.scala
  30. +2 −2 ...i/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala
  31. +9 −9 webapi/src/main/scala/org/knora/webapi/responders/BUILD.bazel
  32. +1 −2 webapi/src/main/scala/org/knora/webapi/responders/admin/ListsResponderADM.scala
  33. +1 −2 webapi/src/main/scala/org/knora/webapi/responders/v1/ListsResponderV1.scala
  34. +9 −8 webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala
  35. +2 −3 webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala
  36. +15 −10 webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala
  37. +7 −3 webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala
  38. +1 −1 webapi/src/main/scala/org/knora/webapi/responders/v2/ValuesResponderV2.scala
  39. +14 −14 webapi/src/main/scala/org/knora/webapi/routing/BUILD.bazel
  40. +8 −17 webapi/src/main/scala/org/knora/webapi/routing/v1/ResourcesRouteV1.scala
  41. +1 −1 webapi/src/main/scala/org/knora/webapi/settings/BUILD.bazel
  42. +1 −1 webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala
  43. +8 −8 webapi/src/main/scala/org/knora/webapi/store/BUILD.bazel
  44. +3 −3 webapi/src/main/scala/org/knora/webapi/store/triplestore/embedded/JenaTDBActor.scala
  45. +1 −1 webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala
  46. +4 −5 webapi/src/main/scala/org/knora/webapi/util/BUILD.bazel
  47. +18 −15 webapi/src/main/scala/org/knora/webapi/util/FileUtil.scala
  48. +0 −8 webapi/src/main/scala/org/knora/webapi/util/JavaUtil.scala
  49. +1 −1 webapi/src/main/scala/org/knora/webapi/util/cache/BUILD.bazel
  50. +4 −2 webapi/src/test/scala/org/knora/webapi/CoreSpec.scala
  51. +2 −2 webapi/src/test/scala/org/knora/webapi/E2ESpec.scala
  52. +2 −2 webapi/src/test/scala/org/knora/webapi/ITKnoraFakeSpec.scala
  53. +2 −2 webapi/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala
  54. +2 −2 webapi/src/test/scala/org/knora/webapi/R2RSpec.scala
  55. +1 −1 webapi/src/test/scala/org/knora/webapi/e2e/http/BUILD.bazel
  56. +1 −2 webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel
  57. +27 −30 webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala
  58. +3 −3 webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel
  59. +1 −1 webapi/src/test/scala/org/knora/webapi/http/version/BUILD.bazel
  60. +1 −1 webapi/src/test/scala/org/knora/webapi/http/version/versioninfo/BUILD.bazel
  61. +1 −1 webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel
  62. +1 −1 ...l/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala
  63. +35 −35 ...s/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala
  64. +2 −2 webapi/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala
  65. +2 −2 webapi/src/test/scala/org/knora/webapi/responders/v1/BUILD.bazel
  66. +2 −2 webapi/src/test/scala/org/knora/webapi/responders/v2/BUILD.bazel
@@ -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.13")
scala_config(scala_version = "2.13.5")

# register default and our custom scala toolchain
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")

Large diffs are not rendered by default.

@@ -7,7 +7,7 @@ load("//third_party:versions.bzl", "AKKA_VERSION", "AKKA_HTTP_VERSION", "JENA_VE

def dependencies():
#
# e.g., to reference use: @maven//com_typesafe_akka_akka_actor_2_12
# e.g., to reference use: @maven//com_typesafe_akka_akka_actor_2_13
#
# ATTENTION: Transitive dependencies need to be explicitly added
# to query: bazel query @maven//:all --output=build
@@ -16,19 +16,19 @@ def dependencies():
maven_install(
artifacts = [
# akka
"com.typesafe.akka:akka-actor_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-slf4j_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-actor_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-slf4j_2.13:%s" % (AKKA_VERSION),

# akka http
"com.typesafe.akka:akka-http_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-xml_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-spray-json_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-jackson_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-xml_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-spray-json_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-jackson_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe:config:1.3.3",

# CORS support
"ch.megard:akka-http-cors_2.12:1.0.0",
"ch.megard:akka-http-cors_2.13:1.0.0",

# Jena
"org.apache.jena:apache-jena-libs:%s" % (JENA_VERSION),
@@ -42,35 +42,35 @@ def dependencies():
),

# Logging
"com.typesafe.scala-logging:scala-logging_2.12:3.8.0",
"com.typesafe.scala-logging:scala-logging_2.13:3.9.3",
"ch.qos.logback:logback-classic:1.2.3",
"ch.qos.logback:logback-core:1.2.3",
"org.slf4j:log4j-over-slf4j:1.7.29",
"org.slf4j:jcl-over-slf4j:1.7.29",
"org.slf4j:slf4j-api:1.7.29",

# metrics
"io.kamon:kamon-core_2.12:2.0.0-RC1",
"io.kamon:kamon-scala-future_2.12:2.0.0-RC1",
"io.kamon:kamon-akka-http_2.12:2.0.0-RC1",
"io.kamon:kamon-prometheus_2.12:2.0.0-RC1",
"io.kamon:kamon-logback_2.12:2.0.0-RC1",
"io.kamon:kamon-core_2.13:2.1.5",
"io.kamon:kamon-scala-future_2.13:2.1.5",
"io.kamon:kamon-akka-http_2.13:2.1.5",
"io.kamon:kamon-prometheus_2.13:2.1.5",
"io.kamon:kamon-logback_2.13:2.1.5",
"org.aspectj:aspectjweaver:1.9.4",

# input validation
"commons-validator:commons-validator:1.6",

# authentication
"org.bouncycastle:bcprov-jdk15on:1.59",
"org.bouncycastle:bcprov-jdk15on:1.64",
"org.springframework.security:spring-security-core:5.1.5.RELEASE",
"com.pauldijou:jwt-spray-json_2.12:0.19.0",
"com.pauldijou:jwt-spray-json_2.13:5.0.0",

# caching
"net.sf.ehcache:ehcache:2.10.3",
"redis.clients:jedis:3.1.0-m4",

# serialization (used in caching)
"com.twitter:chill_2.12:0.9.3",
"com.twitter:chill_2.13:0.9.5",

# other
# "javax.transaction" % "transaction-api" % "1.1-rev-1",
@@ -87,24 +87,23 @@ def dependencies():
"org.eclipse.rdf4j:rdf4j-runtime:3.4.4",
"org.eclipse.rdf4j:rdf4j-client:3.4.4",
"org.eclipse.rdf4j:rdf4j-shacl:3.4.4",
"org.rogach:scallop_2.12:3.2.0",
"org.rogach:scallop_2.13:3.5.1",
"com.google.gwt:gwt-servlet:2.8.0",
"net.sf.saxon:Saxon-HE:9.9.0-2",

"org.scala-lang.modules:scala-xml_2.12:1.1.1",
"com.jsuereth:scala-arm_2.12:2.0",
"org.scala-lang.modules:scala-java8-compat_2.12:0.8.0",
"org.scala-lang.modules:scala-xml_2.13:1.1.1",
"org.scala-lang.modules:scala-java8-compat_2.13:0.9.1",

# provides akka jackson (json) support
"de.heikoseeberger:akka-http-circe_2.12:1.21.0",
"com.fasterxml.jackson.module:jackson-module-scala_2.12:2.9.4",
"de.heikoseeberger:akka-http-circe_2.13:1.36.0",
"com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.3",

"com.apicatalog:titanium-json-ld:0.8.5",
"javax.json:javax.json-api:1.1.4",
"org.glassfish:jakarta.json:1.1.6",

# swagger (api documentation)
"com.github.swagger-akka-http:swagger-akka-http_2.12:1.2.0",
"com.github.swagger-akka-http:swagger-akka-http_2.13:1.2.0",

# Java EE modules which are deprecated in Java SE 9, 10 and will be removed in Java SE 11
"javax.xml.bind:jaxb-api:2.2.12",
@@ -114,20 +113,20 @@ def dependencies():
"org.apache.httpcomponents:httpclient:4.5.6",

# Twirl templates
"com.typesafe.play:twirl-api_2.12:1.3.13",
"com.typesafe.play:twirl-api_2.13:1.5.1",

# scala stuff
"org.scala-lang.modules:scala-xml_2.12:1.2.0",
"org.scala-lang.modules:scala-xml_2.13:1.2.0",

# testing
"com.typesafe.akka:akka-testkit_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream-testkit_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-http-testkit_2.12:%s" % (AKKA_HTTP_VERSION),
"org.scalatest:scalatest_2.12:3.2.2",
"org.scalatest:scalatest-core_2.12:3.2.2",
"org.scalatest:scalatest-wordspec_2.12:3.2.2",
"org.scalatest:scalatest-matchers-core_2.12:3.2.2",
"org.scalatest:scalatest-shouldmatchers_2.12:3.2.2",
"com.typesafe.akka:akka-testkit_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream-testkit_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-http-testkit_2.13:%s" % (AKKA_HTTP_VERSION),
"org.scalatest:scalatest_2.13:3.2.2",
"org.scalatest:scalatest-core_2.13:3.2.2",
"org.scalatest:scalatest-wordspec_2.13:3.2.2",
"org.scalatest:scalatest-matchers-core_2.13:3.2.2",
"org.scalatest:scalatest-shouldmatchers_2.13:3.2.2",
"org.scalatest:scalatest-compatible:3.2.2",
"org.testcontainers:testcontainers:1.15.3",
"junit:junit:4.13",
@@ -139,7 +138,7 @@ def dependencies():
"org.seleniumhq.selenium:selenium-support:3.141.59",

# Graph for Scala
"org.scala-graph:graph-core_2.12:1.13.1",
"org.scala-graph:graph-core_2.13:1.13.1",
],
repositories = [
"https://repo.maven.apache.org/maven2",
@@ -174,33 +173,33 @@ ALL_WEBAPI_MAIN_DEPENDENCIES = [
]

BASE_TEST_DEPENDENCIES = [
"@maven//:com_typesafe_scala_logging_scala_logging_2_12",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_slf4j_slf4j_api",
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_testkit_2_12",
"@maven//:com_typesafe_akka_akka_http_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_http_testkit_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_testkit_2_13",
"@maven//:com_typesafe_akka_akka_http_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_http_testkit_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
"@maven//:com_typesafe_config",
"@maven//:org_scalatest_scalatest_2_12",
"@maven//:org_scalatest_scalatest_core_2_12",
"@maven//:org_scalatest_scalatest_wordspec_2_12",
"@maven//:org_scalatest_scalatest_matchers_core_2_12",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
"@maven//:org_scalatest_scalatest_2_13",
"@maven//:org_scalatest_scalatest_core_2_13",
"@maven//:org_scalatest_scalatest_wordspec_2_13",
"@maven//:org_scalatest_scalatest_matchers_core_2_13",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
"@maven//:org_scalatest_scalatest_compatible",
"@maven//:org_scalactic_scalactic_2_12",
"@maven//:org_scala_graph_graph_core_2_12",
"@maven//:org_scalactic_scalactic_2_13",
"@maven//:org_scala_graph_graph_core_2_13",
]

BASE_TEST_DEPENDENCIES_WITH_JSON = BASE_TEST_DEPENDENCIES + [
"@maven//:com_typesafe_akka_akka_http_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_http_xml_2_12",
"@maven//:io_spray_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
"@maven//:com_typesafe_akka_akka_http_xml_2_13",
"@maven//:io_spray_spray_json_2_13",
]

BASE_TEST_DEPENDENCIES_WITH_JSON_LD = BASE_TEST_DEPENDENCIES + [
"@maven//:io_spray_spray_json_2_12",
"@maven//:io_spray_spray_json_2_13",
"@maven//:com_apicatalog_titanium_json_ld",
"@maven//:javax_json_javax_json_api",
"@maven//:org_glassfish_jakarta_json"
@@ -1,8 +1,8 @@
"""Primary location for setting Knora-API project wide versions"""

SCALA_VERSION = "2.12.11"
SCALA_VERSION = "2.13.5"
AKKA_VERSION = "2.6.5"
AKKA_HTTP_VERSION = "10.2.0"
AKKA_HTTP_VERSION = "10.2.4"
JENA_VERSION = "3.14.0"
METRICS_VERSION = "4.0.1"

@@ -34,7 +34,7 @@ scala_library(
runtime_deps = [
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_typesafe_akka_akka_slf4j_2_12",
"@maven//:com_typesafe_akka_akka_slf4j_2_13",
"@maven//:org_slf4j_log4j_over_slf4j",
],
deps = [
@@ -54,48 +54,47 @@ scala_library(
"//webapi/src/main/scala/org/knora/webapi/util",
"//webapi/src/main/scala/org/knora/webapi/util/cache",
# Logging
"@maven//:com_typesafe_scala_logging_scala_logging_2_12",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_slf4j_jcl_over_slf4j",
"@maven//:org_slf4j_slf4j_api",
#
"@maven//:ch_megard_akka_http_cors_2_12",
"@maven//:ch_megard_akka_http_cors_2_13",
"@maven//:com_fasterxml_jackson_core_jackson_annotations",
"@maven//:com_fasterxml_jackson_core_jackson_databind",
"@maven//:com_github_andrewoma_dexx_collection",
"@maven//:com_apicatalog_titanium_json_ld",
"@maven//:javax_json_javax_json_api",
"@maven//:org_glassfish_jakarta_json",
"@maven//:com_github_swagger_akka_http_swagger_akka_http_2_12",
"@maven//:com_github_swagger_akka_http_swagger_akka_http_2_13",
"@maven//:com_google_gwt_gwt_servlet",
"@maven//:com_ibm_icu_icu4j",
"@maven//:com_jsuereth_scala_arm_2_12",
"@maven//:com_pauldijou_jwt_core_2_12",
"@maven//:com_pauldijou_jwt_json_common_2_12",
"@maven//:com_pauldijou_jwt_spray_json_2_12",
"@maven//:com_pauldijou_jwt_core_2_13",
"@maven//:com_pauldijou_jwt_json_common_2_13",
"@maven//:com_pauldijou_jwt_spray_json_2_13",
"@maven//:com_sksamuel_diff_diff",
"@maven//:com_twitter_chill_2_12",
"@maven//:com_twitter_chill_2_13",
# Akka
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_http_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_parsing_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
"@maven//:com_typesafe_akka_akka_parsing_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
"@maven//:com_typesafe_config",
# Templates
"@maven//:com_typesafe_play_twirl_api_2_12",
"@maven//:com_typesafe_play_twirl_api_2_13",
"@maven//:commons_cli_commons_cli",
"@maven//:commons_codec_commons_codec",
"@maven//:commons_io_commons_io",
"@maven//:commons_validator_commons_validator",
# Telemetry
"@maven//:io_kamon_kamon_core_2_12",
"@maven//:io_kamon_kamon_instrumentation_common_2_12",
# "@maven//:io_kamon_kamon_logback_2_12",
# "@maven//:io_kamon_kamon_prometheus_2_12",
"@maven//:io_kamon_kamon_scala_future_2_12",
"@maven//:io_kamon_kamon_core_2_13",
"@maven//:io_kamon_kamon_instrumentation_common_2_13",
# "@maven//:io_kamon_kamon_logback_2_13",
# "@maven//:io_kamon_kamon_prometheus_2_13",
"@maven//:io_kamon_kamon_scala_future_2_13",
#
"@maven//:io_spray_spray_json_2_12",
"@maven//:io_spray_spray_json_2_13",
"@maven//:io_swagger_swagger_annotations",
"@maven//:io_swagger_swagger_jaxrs",
"@maven//:io_swagger_swagger_models",
@@ -119,9 +118,9 @@ scala_library(
"@maven//:org_apache_lucene_lucene_core",
"@maven//:org_eclipse_rdf4j_rdf4j_client",
"@maven//:org_jodd_jodd",
"@maven//:org_rogach_scallop_2_12",
"@maven//:org_scala_lang_modules_scala_java8_compat_2_12",
"@maven//:org_scala_lang_modules_scala_xml_2_12",
"@maven//:org_rogach_scallop_2_13",
"@maven//:org_scala_lang_modules_scala_java8_compat_2_13",
"@maven//:org_scala_lang_modules_scala_xml_2_13",
"@maven//:org_scala_lang_scala_library",
"@maven//:org_scala_lang_scala_reflect",
"@maven//:org_springframework_security_spring_security_core",
@@ -145,7 +144,7 @@ scala_library(
runtime_deps = [
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_typesafe_akka_akka_slf4j_2_12",
"@maven//:com_typesafe_akka_akka_slf4j_2_13",
"@maven//:org_slf4j_log4j_over_slf4j",
],
deps = [
@@ -163,27 +162,28 @@ scala_library(
"//webapi/src/main/scala/org/knora/webapi/store",
"//webapi/src/main/scala/org/knora/webapi/util",
# Logging
"@maven//:com_typesafe_scala_logging_scala_logging_2_12",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_slf4j_slf4j_api",
# Test Libs
"@maven//:com_typesafe_akka_akka_testkit_2_12",
"@maven//:com_typesafe_akka_akka_http_testkit_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_http_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_testkit_2_13",
"@maven//:com_typesafe_akka_akka_http_testkit_2_13",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
"@maven//:com_typesafe_config",
"@maven//:io_spray_spray_json_2_12",
"@maven//:org_scalactic_scalactic_2_12",
"@maven//:org_scalatest_scalatest_core_2_12",
"@maven//:org_scalatest_scalatest_wordspec_2_12",
"@maven//:org_scalatest_scalatest_matchers_core_2_12",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
"@maven//:io_spray_spray_json_2_13",
"@maven//:org_scalactic_scalactic_2_13",
"@maven//:org_scalatest_scalatest_core_2_13",
"@maven//:org_scalatest_scalatest_wordspec_2_13",
"@maven//:org_scalatest_scalatest_matchers_core_2_13",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
"@maven//:org_scalatest_scalatest_compatible",
"@maven//:org_testcontainers_testcontainers",
"@maven//:junit_junit",
"@maven//:org_apache_commons_commons_pool2",
"@maven//:redis_clients_jedis",
"@maven//:org_bouncycastle_bcprov_jdk15on",
],
)
@@ -8,8 +8,8 @@ scala_library(
srcs = glob(["*.scala"]),
unused_dependency_checker_mode = "warn",
deps = [
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
],
)

0 comments on commit 5feb915

Please sign in to comment.