Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use snakeyaml 2.0 [#16412]. #16415

Merged
merged 4 commits into from
Mar 13, 2023
Merged

Use snakeyaml 2.0 [#16412]. #16415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e4eff8
Upgraded circe-yaml to 15.0-RC1.
atriantafyllos-da Mar 3, 2023
f50741e
Pinned the unpinned.
atriantafyllos-da Mar 13, 2023
e1c9641
Yaml common dependencies.
atriantafyllos-da Mar 3, 2023
4db1de4
Fixed WorkflowConfigParser.
atriantafyllos-da Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bazel-java-deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def install_java_deps():
"io.circe:circe-generic-extras_{}:{}".format(scala_major_version, circe_version),
"io.circe:circe-generic_{}:{}".format(scala_major_version, circe_version),
"io.circe:circe-parser_{}:{}".format(scala_major_version, circe_version),
"io.circe:circe-yaml_{}:{}".format(scala_major_version, circe_version),
"io.circe:circe-yaml_{}:{}".format(scala_major_version, "0.15.0-RC1"),
"io.dropwizard.metrics:metrics-core:{}".format(dropwizard_version),
"io.dropwizard.metrics:metrics-jmx:{}".format(dropwizard_version),
"io.dropwizard.metrics:metrics-jvm:{}".format(dropwizard_version),
Expand Down
1 change: 1 addition & 0 deletions daml-assistant/scala-daml-project-config/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ da_scala_library(
scala_deps = [
"@maven//:io_circe_circe_core",
"@maven//:io_circe_circe_yaml",
"@maven//:io_circe_circe_yaml_common",
"@maven//:org_typelevel_cats_core",
],
tags = ["maven_coordinates=com.daml:daml-sdk-project-config:__VERSION__"],
Expand Down
1 change: 1 addition & 0 deletions daml-script/export/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ da_scala_binary(
"@maven//:org_typelevel_paiges_core",
"@maven//:io_circe_circe_core",
"@maven//:io_circe_circe_yaml",
"@maven//:io_circe_circe_yaml_common",
],
scalacopts = lf_scalacopts_stricter,
visibility = ["//visibility:public"],
Expand Down
1 change: 1 addition & 0 deletions ledger/ledger-api-bench-tool/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ da_scala_library(
"@maven//:com_typesafe_akka_akka_stream",
"@maven//:io_circe_circe_core",
"@maven//:io_circe_circe_yaml",
"@maven//:io_circe_circe_yaml_common",
"@maven//:org_typelevel_cats_core",
],
visibility = ["//visibility:public"],
Expand Down
11 changes: 5 additions & 6 deletions ...bench-tool/src/main/scala/com/daml/ledger/api/benchtool/config/WorkflowConfigParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
package com.daml.ledger.api.benchtool.config

import cats.syntax.functor._
import com.daml.ledger.api.v1.ledger_offset.LedgerOffset
import io.circe.yaml.parser
import io.circe.{Decoder, HCursor}
import java.io.Reader

import com.daml.ledger.api.benchtool.config.WorkflowConfig.FooSubmissionConfig.{
ConsumingExercises,
NonconsumingExercises,
Expand All @@ -17,7 +12,11 @@ import com.daml.ledger.api.benchtool.config.WorkflowConfig.StreamConfig.{
PartyFilter,
PartyNamePrefixFilter,
}
import com.daml.ledger.api.v1.ledger_offset.LedgerOffset
import io.circe.yaml.Parser
import io.circe.{Decoder, HCursor}

import java.io.Reader
import scala.concurrent.duration.{Duration, FiniteDuration}
import scala.util.{Failure, Success, Try}

Expand All @@ -26,7 +25,7 @@ object WorkflowConfigParser {
import WorkflowConfig._

def parse(reader: Reader): Either[ParserError, WorkflowConfig] =
parser
Parser.default
.parse(reader)
.flatMap(_.as[WorkflowConfig])
.left
Expand Down
110 changes: 76 additions & 34 deletions maven_install_2.13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -354198502,
"__RESOLVED_ARTIFACTS_HASH": 1866980303,
"__INPUT_ARTIFACTS_HASH": 1063358344,
"__RESOLVED_ARTIFACTS_HASH": -534566777,
"conflict_resolution": {},
"dependencies": [
{
Expand Down Expand Up @@ -4212,49 +4212,89 @@
"url": "https://repo1.maven.org/maven2/io/circe/circe-parser_2.13/0.14.2/circe-parser_2.13-0.14.2-sources.jar"
},
{
"coord": "io.circe:circe-yaml_2.13:0.14.2",
"coord": "io.circe:circe-yaml-common_2.13:0.15.0-RC1",
"dependencies": [
"io.circe:circe-core_2.13:0.14.2",
"org.scala-lang:scala-library:2.13.10",
"org.yaml:snakeyaml:1.33"
"org.scala-lang:scala-library:2.13.10"
],
"directDependencies": [
"io.circe:circe-core_2.13:0.14.2",
"org.scala-lang:scala-library:2.13.10"
],
"file": "v1/https/repo1.maven.org/maven2/io/circe/circe-yaml-common_2.13/0.15.0-RC1/circe-yaml-common_2.13-0.15.0-RC1.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/io/circe/circe-yaml-common_2.13/0.15.0-RC1/circe-yaml-common_2.13-0.15.0-RC1.jar"
],
"packages": [
"io.circe.yaml.common"
],
"sha256": "4f147dfee870e71e584d7479cfc0bcb70d323c471e3668b507915d0bb0ecf715",
"url": "https://repo1.maven.org/maven2/io/circe/circe-yaml-common_2.13/0.15.0-RC1/circe-yaml-common_2.13-0.15.0-RC1.jar"
},
{
"coord": "io.circe:circe-yaml-common_2.13:jar:sources:0.15.0-RC1",
"dependencies": [
"io.circe:circe-core_2.13:jar:sources:0.14.2",
"org.scala-lang:scala-library:jar:sources:2.13.10"
],
"directDependencies": [
"io.circe:circe-core_2.13:jar:sources:0.14.2",
"org.scala-lang:scala-library:jar:sources:2.13.10"
],
"file": "v1/https/repo1.maven.org/maven2/io/circe/circe-yaml-common_2.13/0.15.0-RC1/circe-yaml-common_2.13-0.15.0-RC1-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/io/circe/circe-yaml-common_2.13/0.15.0-RC1/circe-yaml-common_2.13-0.15.0-RC1-sources.jar"
],
"packages": [],
"sha256": "016db768646f6b6550152a219c2b9fd4de2cf2705c9ab4c0f5ddccbc831f827d",
"url": "https://repo1.maven.org/maven2/io/circe/circe-yaml-common_2.13/0.15.0-RC1/circe-yaml-common_2.13-0.15.0-RC1-sources.jar"
},
{
"coord": "io.circe:circe-yaml_2.13:0.15.0-RC1",
"dependencies": [
"io.circe:circe-core_2.13:0.14.2",
"io.circe:circe-yaml-common_2.13:0.15.0-RC1",
"org.scala-lang:scala-library:2.13.10",
"org.yaml:snakeyaml:1.33"
"org.yaml:snakeyaml:2.0"
],
"file": "v1/https/repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.14.2/circe-yaml_2.13-0.14.2.jar",
"directDependencies": [
"io.circe:circe-yaml-common_2.13:0.15.0-RC1",
"org.scala-lang:scala-library:2.13.10",
"org.yaml:snakeyaml:2.0"
],
"file": "v1/https/repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.15.0-RC1/circe-yaml_2.13-0.15.0-RC1.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.14.2/circe-yaml_2.13-0.14.2.jar"
"https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.15.0-RC1/circe-yaml_2.13-0.15.0-RC1.jar"
],
"packages": [
"io.circe.yaml",
"io.circe.yaml.parser",
"io.circe.yaml.printer",
"io.circe.yaml.syntax"
],
"sha256": "14d5deab77839027f16c5d9c690c478127370f3b8bc68c6656e5b6ba48eafe04",
"url": "https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.14.2/circe-yaml_2.13-0.14.2.jar"
"sha256": "c18dd54500b17d3f8c6e7d9a30b1398a768984a23bf03ab020f58cfea1a1f3c3",
"url": "https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.15.0-RC1/circe-yaml_2.13-0.15.0-RC1.jar"
},
{
"coord": "io.circe:circe-yaml_2.13:jar:sources:0.14.2",
"coord": "io.circe:circe-yaml_2.13:jar:sources:0.15.0-RC1",
"dependencies": [
"io.circe:circe-core_2.13:jar:sources:0.14.2",
"io.circe:circe-yaml-common_2.13:jar:sources:0.15.0-RC1",
"org.scala-lang:scala-library:jar:sources:2.13.10",
"org.yaml:snakeyaml:jar:sources:1.33"
"org.yaml:snakeyaml:jar:sources:2.0"
],
"directDependencies": [
"io.circe:circe-core_2.13:jar:sources:0.14.2",
"io.circe:circe-yaml-common_2.13:jar:sources:0.15.0-RC1",
"org.scala-lang:scala-library:jar:sources:2.13.10",
"org.yaml:snakeyaml:jar:sources:1.33"
"org.yaml:snakeyaml:jar:sources:2.0"
],
"file": "v1/https/repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.14.2/circe-yaml_2.13-0.14.2-sources.jar",
"file": "v1/https/repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.15.0-RC1/circe-yaml_2.13-0.15.0-RC1-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.14.2/circe-yaml_2.13-0.14.2-sources.jar"
"https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.15.0-RC1/circe-yaml_2.13-0.15.0-RC1-sources.jar"
],
"packages": [],
"sha256": "9ba783dac42da9c6ac228a07baf88caf226f001b237c6decedf5a8b7fb3f7ca4",
"url": "https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.14.2/circe-yaml_2.13-0.14.2-sources.jar"
"sha256": "85b8d8a13321d386c7c767f1f37c75d209aa9aa39f4f81168f1680d9df8598bd",
"url": "https://repo1.maven.org/maven2/io/circe/circe-yaml_2.13/0.15.0-RC1/circe-yaml_2.13-0.15.0-RC1-sources.jar"
},
{
"coord": "io.dropwizard.metrics:metrics-core:4.1.33",
Expand Down Expand Up @@ -15039,7 +15079,7 @@
"org.scalatest:scalatest-compatible:3.2.9",
"org.scalatest:scalatest-core_2.13:3.2.9",
"org.testng:testng:6.7",
"org.yaml:snakeyaml:1.33"
"org.yaml:snakeyaml:2.0"
],
"directDependencies": [
"org.scala-lang:scala-library:2.13.10",
Expand Down Expand Up @@ -15069,7 +15109,7 @@
"org.scalatest:scalatest-compatible:jar:sources:3.2.9",
"org.scalatest:scalatest-core_2.13:jar:sources:3.2.9",
"org.testng:testng:jar:sources:6.7",
"org.yaml:snakeyaml:jar:sources:1.33"
"org.yaml:snakeyaml:jar:sources:2.0"
],
"directDependencies": [
"org.scala-lang:scala-library:jar:sources:2.13.10",
Expand Down Expand Up @@ -16307,13 +16347,13 @@
"com.beust:jcommander:1.12",
"junit:junit:4.13.2",
"org.beanshell:bsh:2.0b4",
"org.yaml:snakeyaml:1.33"
"org.yaml:snakeyaml:2.0"
],
"directDependencies": [
"com.beust:jcommander:1.12",
"junit:junit:4.13.2",
"org.beanshell:bsh:2.0b4",
"org.yaml:snakeyaml:1.33"
"org.yaml:snakeyaml:2.0"
],
"file": "v1/https/repo1.maven.org/maven2/org/testng/testng/6.7/testng-6.7.jar",
"mirror_urls": [
Expand Down Expand Up @@ -16355,13 +16395,13 @@
"com.beust:jcommander:jar:sources:1.12",
"junit:junit:jar:sources:4.13.2",
"org.beanshell:bsh:jar:sources:2.0b4",
"org.yaml:snakeyaml:jar:sources:1.33"
"org.yaml:snakeyaml:jar:sources:2.0"
],
"directDependencies": [
"com.beust:jcommander:jar:sources:1.12",
"junit:junit:jar:sources:4.13.2",
"org.beanshell:bsh:jar:sources:2.0b4",
"org.yaml:snakeyaml:jar:sources:1.33"
"org.yaml:snakeyaml:jar:sources:2.0"
],
"file": "v1/https/repo1.maven.org/maven2/org/testng/testng/6.7/testng-6.7-sources.jar",
"mirror_urls": [
Expand Down Expand Up @@ -17326,12 +17366,12 @@
"url": "https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.36.0.1/sqlite-jdbc-3.36.0.1-sources.jar"
},
{
"coord": "org.yaml:snakeyaml:1.33",
"coord": "org.yaml:snakeyaml:2.0",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar",
"file": "v1/https/repo1.maven.org/maven2/org/yaml/snakeyaml/2.0/snakeyaml-2.0.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar"
"https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.0/snakeyaml-2.0.jar"
],
"packages": [
"org.yaml.snakeyaml",
Expand All @@ -17345,6 +17385,8 @@
"org.yaml.snakeyaml.extensions.compactnotation",
"org.yaml.snakeyaml.external.biz.base64Coder",
"org.yaml.snakeyaml.external.com.google.gdata.util.common.base",
"org.yaml.snakeyaml.inspector",
"org.yaml.snakeyaml.internal",
"org.yaml.snakeyaml.introspector",
"org.yaml.snakeyaml.nodes",
"org.yaml.snakeyaml.parser",
Expand All @@ -17356,20 +17398,20 @@
"org.yaml.snakeyaml.tokens",
"org.yaml.snakeyaml.util"
],
"sha256": "11ff459788f0a2d781f56a4a86d7e69202cebacd0273d5269c4ae9f02f3fd8f0",
"url": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar"
"sha256": "880c9d896e4b74a06c549c15ca496450165d6909fa15d7e662bee8f6a66d7afa",
"url": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.0/snakeyaml-2.0.jar"
},
{
"coord": "org.yaml:snakeyaml:jar:sources:1.33",
"coord": "org.yaml:snakeyaml:jar:sources:2.0",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33-sources.jar",
"file": "v1/https/repo1.maven.org/maven2/org/yaml/snakeyaml/2.0/snakeyaml-2.0-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33-sources.jar"
"https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.0/snakeyaml-2.0-sources.jar"
],
"packages": [],
"sha256": "0fd139895c752d626610bc29641209dc511b591f1d46b2cae6a59193625555e4",
"url": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.33/snakeyaml-1.33-sources.jar"
"sha256": "9b336f77718ee80225d3d878fe5ab753e9863614fb84e3e859d51432dde43199",
"url": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.0/snakeyaml-2.0-sources.jar"
},
{
"coord": "ru.vyarus:generics-resolver:3.0.3",
Expand Down