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

Revert "Upgrade hikari to latest jdk8 version (#10406)" #10421

Merged
merged 1 commit into from
Jul 27, 2021
Merged

Revert "Upgrade hikari to latest jdk8 version (#10406)" #10421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Revert "Upgrade hikari to latest jdk8 version (#10406)" 
This reverts commit d88dc71.

This causes some issues for Canton so reverting until we figure that
out. Tracked in #10420

changelog_begin
changelog_end
  • Loading branch information
@cocreature
cocreature committed Jul 27, 2021
commit 585c957aaa98bc89dcb88f920f4850a40bc11ec5
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 @@ -80,7 +80,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:4.0.3",
"com.zaxxer:HikariCP:3.2.0",
"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
30 changes: 15 additions & 15 deletions maven_install_2.12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -304257054,
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -199369581,
"conflict_resolution": {},
"dependencies": [
{
Expand Down Expand Up @@ -2735,34 +2735,34 @@
"url": "https://repo1.maven.org/maven2/com/typesafe/ssl-config-core_2.12/0.4.2/ssl-config-core_2.12-0.4.2-sources.jar"
},
{
"coord": "com.zaxxer:HikariCP:4.0.3",
"coord": "com.zaxxer:HikariCP:3.2.0",
"dependencies": [
"org.slf4j:slf4j-api:1.7.26"
],
"directDependencies": [
"org.slf4j:slf4j-api:1.7.26"
],
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar",
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar"
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar"
],
"sha256": "7c024aeff1c1063576d74453513f9de6447d8e624d17f8e27f30a2e97688c6c9",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar"
"sha256": "b008de68bbd85811f4b6e8f0860d0966c6acb4f2e75fabd46ec2094569cbefeb",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar"
},
{
"coord": "com.zaxxer:HikariCP:jar:sources:4.0.3",
"coord": "com.zaxxer:HikariCP:jar:sources:3.2.0",
"dependencies": [
"org.slf4j:slf4j-api:jar:sources:1.7.26"
],
"directDependencies": [
"org.slf4j:slf4j-api:jar:sources:1.7.26"
],
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-sources.jar",
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-sources.jar"
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar"
],
"sha256": "671c75a139a1661bd82f6e178031cd67008752291dd39d658a3aefb793854405",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-sources.jar"
"sha256": "a66fc818710bc62c3fe19accc933f234dcec7bb58ac7cb36518d46ff57a6c666",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar"
},
{
"coord": "commons-codec:commons-codec:1.14",
Expand Down Expand Up @@ -9454,8 +9454,8 @@
"dependencies": [
"co.fs2:fs2-core_2.12:2.5.6",
"org.typelevel:cats-effect_2.12:2.5.1",
"com.zaxxer:HikariCP:4.0.3",
"org.tpolecat:doobie-free_2.12:0.13.4",
"com.zaxxer:HikariCP:3.2.0",
"com.chuusai:shapeless_2.12:2.3.3",
"org.slf4j:slf4j-api:1.7.26",
"org.typelevel:cats-core_2.12:2.6.1",
Expand All @@ -9471,7 +9471,7 @@
"org.scala-lang:scala-library:2.12.13"
],
"directDependencies": [
"com.zaxxer:HikariCP:4.0.3",
"com.zaxxer:HikariCP:3.2.0",
"org.slf4j:slf4j-api:1.7.26",
"org.tpolecat:doobie-core_2.12:0.13.4",
"org.scala-lang.modules:scala-collection-compat_2.12:2.3.2",
Expand All @@ -9492,12 +9492,12 @@
"org.typelevel:cats-free_2.12:jar:sources:2.6.1",
"org.tpolecat:typename_2.12:jar:sources:1.0.0",
"com.chuusai:shapeless_2.12:jar:sources:2.3.3",
"com.zaxxer:HikariCP:jar:sources:3.2.0",
"org.tpolecat:doobie-free_2.12:jar:sources:0.13.4",
"org.typelevel:cats-effect_2.12:jar:sources:2.5.1",
"org.slf4j:slf4j-api:jar:sources:1.7.26",
"org.typelevel:cats-core_2.12:jar:sources:2.6.1",
"org.scodec:scodec-bits_2.12:jar:sources:1.1.27",
"com.zaxxer:HikariCP:jar:sources:4.0.3",
"org.scala-lang:scala-library:jar:sources:2.12.13",
"org.tpolecat:doobie-core_2.12:jar:sources:0.13.4",
"co.fs2:fs2-core_2.12:jar:sources:2.5.6",
Expand All @@ -9506,8 +9506,8 @@
"org.typelevel:macro-compat_2.12:jar:sources:1.1.1"
],
"directDependencies": [
"com.zaxxer:HikariCP:jar:sources:3.2.0",
"org.slf4j:slf4j-api:jar:sources:1.7.26",
"com.zaxxer:HikariCP:jar:sources:4.0.3",
"org.scala-lang:scala-library:jar:sources:2.12.13",
"org.tpolecat:doobie-core_2.12:jar:sources:0.13.4",
"org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2"
Expand Down
32 changes: 16 additions & 16 deletions maven_install_2.13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -2052521908,
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1816797635,
"conflict_resolution": {},
"dependencies": [
{
Expand Down Expand Up @@ -2819,34 +2819,34 @@
"url": "https://repo1.maven.org/maven2/com/typesafe/ssl-config-core_2.13/0.4.2/ssl-config-core_2.13-0.4.2-sources.jar"
},
{
"coord": "com.zaxxer:HikariCP:4.0.3",
"coord": "com.zaxxer:HikariCP:3.2.0",
"dependencies": [
"org.slf4j:slf4j-api:1.7.26"
],
"directDependencies": [
"org.slf4j:slf4j-api:1.7.26"
],
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar",
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar"
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar"
],
"sha256": "7c024aeff1c1063576d74453513f9de6447d8e624d17f8e27f30a2e97688c6c9",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar"
"sha256": "b008de68bbd85811f4b6e8f0860d0966c6acb4f2e75fabd46ec2094569cbefeb",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar"
},
{
"coord": "com.zaxxer:HikariCP:jar:sources:4.0.3",
"coord": "com.zaxxer:HikariCP:jar:sources:3.2.0",
"dependencies": [
"org.slf4j:slf4j-api:jar:sources:1.7.26"
],
"directDependencies": [
"org.slf4j:slf4j-api:jar:sources:1.7.26"
],
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-sources.jar",
"file": "v1/https/repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-sources.jar"
"https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar"
],
"sha256": "671c75a139a1661bd82f6e178031cd67008752291dd39d658a3aefb793854405",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3-sources.jar"
"sha256": "a66fc818710bc62c3fe19accc933f234dcec7bb58ac7cb36518d46ff57a6c666",
"url": "https://repo1.maven.org/maven2/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar"
},
{
"coord": "commons-codec:commons-codec:1.14",
Expand Down Expand Up @@ -11805,10 +11805,10 @@
"coord": "org.tpolecat:doobie-hikari_2.13:0.13.4",
"dependencies": [
"org.typelevel:simulacrum-scalafix-annotations_2.13:0.5.4",
"com.zaxxer:HikariCP:4.0.3",
"org.tpolecat:doobie-core_2.13:0.13.4",
"org.typelevel:cats-core_2.13:2.6.1",
"org.scodec:scodec-bits_2.13:1.1.27",
"com.zaxxer:HikariCP:3.2.0",
"org.tpolecat:doobie-free_2.13:0.13.4",
"org.slf4j:slf4j-api:1.7.26",
"co.fs2:fs2-core_2.13:2.5.6",
Expand All @@ -11822,8 +11822,8 @@
"org.scala-lang.modules:scala-collection-compat_2.13:2.3.2"
],
"directDependencies": [
"com.zaxxer:HikariCP:4.0.3",
"org.tpolecat:doobie-core_2.13:0.13.4",
"com.zaxxer:HikariCP:3.2.0",
"org.slf4j:slf4j-api:1.7.26",
"org.scala-lang:scala-library:2.13.5",
"org.scala-lang.modules:scala-collection-compat_2.13:2.3.2"
Expand All @@ -11842,25 +11842,25 @@
"co.fs2:fs2-core_2.13:jar:sources:2.5.6",
"org.scodec:scodec-bits_2.13:jar:sources:1.1.27",
"com.chuusai:shapeless_2.13:jar:sources:2.3.3",
"com.zaxxer:HikariCP:jar:sources:3.2.0",
"org.scala-lang:scala-library:jar:sources:2.13.5",
"org.slf4j:slf4j-api:jar:sources:1.7.26",
"org.typelevel:cats-effect_2.13:jar:sources:2.5.1",
"org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2",
"org.tpolecat:doobie-core_2.13:jar:sources:0.13.4",
"org.typelevel:cats-kernel_2.13:jar:sources:2.6.1",
"com.zaxxer:HikariCP:jar:sources:4.0.3",
"org.typelevel:simulacrum-scalafix-annotations_2.13:jar:sources:0.5.4",
"org.typelevel:cats-free_2.13:jar:sources:2.6.1",
"org.typelevel:cats-core_2.13:jar:sources:2.6.1",
"org.tpolecat:doobie-free_2.13:jar:sources:0.13.4",
"org.tpolecat:typename_2.13:jar:sources:1.0.0"
],
"directDependencies": [
"com.zaxxer:HikariCP:jar:sources:3.2.0",
"org.scala-lang:scala-library:jar:sources:2.13.5",
"org.slf4j:slf4j-api:jar:sources:1.7.26",
"org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2",
"org.tpolecat:doobie-core_2.13:jar:sources:0.13.4",
"com.zaxxer:HikariCP:jar:sources:4.0.3"
"org.tpolecat:doobie-core_2.13:jar:sources:0.13.4"
],
"file": "v1/https/repo1.maven.org/maven2/org/tpolecat/doobie-hikari_2.13/0.13.4/doobie-hikari_2.13-0.13.4-sources.jar",
"mirror_urls": [
Expand Down