Skip to content

Commit

Permalink
Upgrade daml libraries 2 (rxjava, HikariCP, squareup, commons-io, sou…
Browse files Browse the repository at this point in the history 
…rcecode, gson, scalameter, checkerframework) [DPP-1362] (digital-asset#15939)

Upgraded
* checkerframework
* scalameter
* gson
* sourcecode
* commons-io
* squareup
* HikariCP
* rxjava
  • Loading branch information
@atriantafyllos-da
atriantafyllos-da authored Dec 21, 2022
1 parent 2dd939c commit c43e58e
Show file tree
Hide file tree
Showing 5 changed files with 467 additions and 546 deletions.
18 changes: 9 additions & 9 deletions bazel-java-deps.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@ def install_java_deps():
maven.artifact("com.github.pureconfig", "pureconfig-macros_2.12", "0.14.0", neverlink = True),
"com.github.scopt:scopt_{}:4.0.0".format(scala_major_version),
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.9.0",
"com.google.code.gson:gson:2.10",
"com.google.guava:guava:{}".format(guava_version),
"com.h2database:h2:2.1.210",
"com.github.pathikrit:better-files_{}:3.8.0".format(scala_major_version),
"com.github.tototoshi:scala-csv_{}:1.3.10".format(scala_major_version),
"com.lihaoyi:sourcecode_{}:0.2.7".format(scala_major_version),
"com.lihaoyi:sourcecode_{}:0.3.0".format(scala_major_version),
"com.lihaoyi:pprint_{}:0.7.1".format(scala_major_version),
"com.lihaoyi:sjsonnet_{}:0.3.0".format(scala_major_version),
"commons-io:commons-io:2.5",
"commons-io:commons-io:2.11.0",
"com.oracle.database.jdbc:ojdbc8:19.14.0.0",
"com.sparkjava:spark-core:2.9.1",
"com.oracle.database.jdbc.debug:ojdbc8_g:19.14.0.0",
"com.squareup:javapoet:1.11.1",
"com.storm-enroute:scalameter_{}:0.19".format(scala_major_version),
"com.storm-enroute:scalameter-core_{}:0.19".format(scala_major_version),
"com.squareup:javapoet:1.13.0",
"com.storm-enroute:scalameter_{}:0.21".format(scala_major_version),
"com.storm-enroute:scalameter-core_{}:0.21".format(scala_major_version),
"com.typesafe.akka:akka-actor_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-actor-testkit-typed_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-actor-typed_{}:{}".format(scala_major_version, akka_version),
Expand All @@ -103,7 +103,7 @@ def install_java_deps():
"org.playframework.anorm:anorm_{}:2.6.8".format(scala_major_version),
"org.playframework.anorm:anorm-akka_{}:2.6.8".format(scala_major_version),
"com.typesafe.scala-logging:scala-logging_{}:3.9.2".format(scala_major_version),
"com.zaxxer:HikariCP:3.2.0",
"com.zaxxer:HikariCP:5.0.1",
"eu.rekawek.toxiproxy:toxiproxy-java:2.1.3",
"io.circe:circe-core_{}:0.13.0".format(scala_major_version),
"io.circe:circe-generic_{}:0.13.0".format(scala_major_version),
Expand Down Expand Up @@ -159,7 +159,7 @@ def install_java_deps():
"io.gatling.highcharts:gatling-charts-highcharts:{}".format(gatling_version),
"io.gatling:gatling-http:{}".format(gatling_version),
"io.gatling:gatling-http-client:{}".format(gatling_version),
"io.reactivex.rxjava2:rxjava:2.2.1",
"io.reactivex.rxjava2:rxjava:2.2.21",
"io.spray:spray-json_{}:1.3.5".format(scala_major_version),
"io.github.paoloboni:spray-json-derived-codecs_{}:2.3.4".format(scala_major_version),
"javax.annotation:javax.annotation-api:1.2",
Expand All @@ -173,7 +173,7 @@ def install_java_deps():
"org.apache.commons:commons-lang3:3.9",
"org.apache.commons:commons-text:1.4",
"org.awaitility:awaitility:4.2.0",
"org.checkerframework:checker:2.5.4",
"org.checkerframework:checker:3.28.0",
"org.flywaydb:flyway-core:8.4.1",
"org.freemarker:freemarker-gae:2.3.28",
"org.jline:jline:3.7.1",
Expand Down
2 changes: 1 addition & 1 deletion language-support/java/bindings-rxjava/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ da_java_library(
"@maven//:io_grpc_grpc_stub",
"@maven//:io_netty_netty_handler",
"@maven//:io_reactivex_rxjava2_rxjava",
"@maven//:org_checkerframework_checker",
"@maven//:org_checkerframework_checker_qual",
"@maven//:org_pcollections_pcollections",
"@maven//:org_slf4j_slf4j_api",
],
Expand Down
2 changes: 1 addition & 1 deletion language-support/java/bindings/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ da_java_library(
"@maven//:io_grpc_grpc_protobuf",
"@maven//:io_grpc_grpc_stub",
"@maven//:javax_annotation_javax_annotation_api",
"@maven//:org_checkerframework_checker",
"@maven//:org_checkerframework_checker_qual",
],
)

Expand Down
11 changes: 6 additions & 5 deletions ...i/perf-testing/src/main/scala/com/digitalasset/ledger/api/perf/util/PerformanceTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package com.daml.ledger.api.perf.util

import com.daml.ledger.api.perf.util.reporter.JMeterReporter
import org.scalameter.KeyValue
import org.scalameter.api._
import org.scalameter.execution.{LocalExecutor, SeparateJvmsExecutor}
import org.scalameter.picklers.Implicits._
Expand Down Expand Up @@ -51,11 +52,11 @@ abstract class PerformanceTest extends Bench[Double] {

protected def daConfig: Seq[org.scalameter.KeyValue] =
Seq[org.scalameter.KeyValue](
exec.independentSamples -> 1,
exec.minWarmupRuns -> 5,
exec.benchRuns -> 20,
exec.jvmflags -> List("-Xmx4096m", "-Xms4096m"),
verbose -> true,
KeyValue(exec.independentSamples -> 1),
KeyValue(exec.minWarmupRuns -> 5),
KeyValue(exec.benchRuns -> 20),
KeyValue(exec.jvmflags -> List("-Xmx4096m", "-Xms4096m")),
KeyValue(verbose -> true),
)

protected def await[T](f: => Future[T]): T = {
Expand Down
Loading

0 comments on commit c43e58e

Please sign in to comment.