Revert bouncy castle fix, included in #17236.

This partially reverts commit 2f4b494.
digital-asset · Aug 22, 2023 · d05d1ff · d05d1ff
1 parent 755ea16
commit d05d1ff
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/canton/BUILD.bazel b/canton/BUILD.bazel
@@ -17,7 +17,6 @@ java_binary(
     runtime_deps = [
         # Do not sort
         "//canton:lib",
-        "@maven//:org_bouncycastle_bcprov_jdk15on",
     ],
 )
 
@@ -33,7 +32,6 @@ java_binary(
         "//daml-lf/engine",
         "//daml-lf/archive:daml_lf_archive_reader",
         "//canton:lib",
-        "@maven//:org_bouncycastle_bcprov_jdk15on",
     ],
 )
 
@@ -96,7 +94,7 @@ fi
 
 tar xzf $$tmp
 
-cp canton-*/lib/canton-*.jar $@
+cp canton-*/lib/*.jar $@
 """.format(
         artif_user = artif_user,
         artif_pass = artif_pass,
@@ -122,8 +120,5 @@ java_binary(
     main_class = "com.digitalasset.canton.CantonEnterpriseApp",
     tags = ["canton-ee"],
     visibility = ["//ledger-service:__subpackages__"],
-    runtime_deps = [
-        "//canton:lib-ee",
-        "@maven//:org_bouncycastle_bcprov_jdk15on",
-    ],
+    runtime_deps = ["//canton:lib-ee"],
 )
diff --git a/compiler/damlc/tests/BUILD.bazel b/compiler/damlc/tests/BUILD.bazel
@@ -665,7 +665,7 @@ da_haskell_test(
         "//compiler/damlc",
         "//daml-script/daml:daml-script.dar",
         "//test-common/test-certificates",
-        "//canton:canton_deploy.jar",
+        "//canton:lib",
     ] + (["@sysctl_nix//:bin/sysctl"] if is_darwin else []),
     hackage_deps = [
         "aeson",
@@ -707,7 +707,7 @@ da_haskell_test(
         "//compiler/damlc/stable-packages",
         "//compiler/repl-service/server:repl_service_jar",
         "//daml-script/daml:daml-script.dar",
-        "//canton:canton_deploy.jar",
+        "//canton:lib",
     ] + (["@sysctl_nix//:bin/sysctl"] if is_darwin else []),
     hackage_deps = [
         "async",
@@ -1026,7 +1026,7 @@ da_haskell_test(
     data = [
         ":pkg-manager-test.dar",
         "//compiler/damlc",
-        "//canton:canton_deploy.jar",
+        "//canton:lib",
     ] + (["@sysctl_nix//:bin/sysctl"] if is_darwin else []),
     hackage_deps = [
         "base",

diff --git a/deps.bzl b/deps.bzl
@@ -376,7 +376,7 @@ genrule(
 package(default_visibility = ["//visibility:public"])
 filegroup(
   name = "jar",
-  srcs = glob(["*/lib/**/canton-*.jar"]),
+  srcs = glob(["*/lib/**/*.jar"]),
 )
         """,
             sha256 = canton["sha"],

diff --git a/language-support/hs/bindings/BUILD.bazel b/language-support/hs/bindings/BUILD.bazel
@@ -53,7 +53,7 @@ da_haskell_test(
     data = [
         ":for-tests.dar",
         ":for-upload.dar",
-        "//canton:canton_deploy.jar",
+        "//canton:lib",
     ] + (["@sysctl_nix//:bin/sysctl"] if is_darwin else []),
     # The tests throw flaky timeout errors. It looks like this comes
     # from a fundamental issue in the Haskell bindings: they eagerly pull

diff --git a/libs-haskell/test-utils/BUILD.bazel b/libs-haskell/test-utils/BUILD.bazel
@@ -10,7 +10,7 @@ da_haskell_library(
     name = "test-utils",
     srcs = glob(["DA/Test/**/*.hs"]),
     data = [
-        "//canton:canton_deploy.jar",
+        "//canton:canton-lib.jar",
     ],
     hackage_deps = [
         "aeson",

diff --git a/libs-haskell/test-utils/DA/Test/Sandbox.hs b/libs-haskell/test-utils/DA/Test/Sandbox.hs
@@ -223,7 +223,7 @@ getCantonConfig conf@SandboxConfig{..} portFile mCerts (ledgerPort, adminPort, d
 
 getCantonSandboxProc :: FilePath -> FilePath -> IO CreateProcess
 getCantonSandboxProc configPath bootstrapPath = do
-    canton <- locateRunfiles $ mainWorkspace </> "canton" </> "canton_deploy.jar"
+    canton <- locateRunfiles $ mainWorkspace </> "canton" </> "canton-lib.jar"
     java <- getJava
     pure $ proc java $ concat
       [ ["-jar", canton]

diff --git a/release/util.bzl b/release/util.bzl
@@ -26,7 +26,7 @@ inputs = {
     "templates": "//templates:templates-tarball.tar.gz",
     "trigger_dars": "//triggers/daml:daml-trigger-dars",
     "script_dars": "//daml-script/daml:daml-script-dars",
-    "canton": "//canton:canton_deploy.jar",
+    "canton": "//canton:lib",
     "sdk_deploy_jar": {
         "ce": "//daml-assistant/daml-sdk:sdk_deploy.jar",
         "ee": "//daml-assistant/daml-sdk:sdk_ee_deploy.jar",