From 5e4be72b5accb4e7a57d95aa28be60124c0948d8 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 16 May 2019 18:56:12 +0200 Subject: [PATCH] Bazel: Simplify names of bouncy castle libraries Name bouncy castle libraries consistently. This also allows to use local jgit tree as dependency in gerrit. Change-Id: Ie0a995a70ecee907d25b3cdda9034a25c0290efe Signed-off-by: David Ostrovsky --- WORKSPACE | 6 +++--- lib/BUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8ee3fece4..7ddd55463 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -215,21 +215,21 @@ maven_jar( BOUNCYCASTLE_VER = "1.60" maven_jar( - name = "bcpg-jdk15on", + name = "bcpg", artifact = "org.bouncycastle:bcpg-jdk15on:" + BOUNCYCASTLE_VER, sha1 = "13c7a199c484127daad298996e95818478431a2c", src_sha1 = "edcd9e86d95e39b4da39bb295efd93bc4f56266e", ) maven_jar( - name = "bcprov-jdk15on", + name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk15on:" + BOUNCYCASTLE_VER, sha1 = "bd47ad3bd14b8e82595c7adaa143501e60842a84", src_sha1 = "7c57a4d13fe53d9abb967bba600dd0b293dafd6a", ) maven_jar( - name = "bcpkix-jdk15on", + name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk15on:" + BOUNCYCASTLE_VER, sha1 = "d0c46320fbc07be3a24eb13a56cee4e3d38e0c75", src_sha1 = "a25f041293f401af08efba63ff4bbdce98134a03", diff --git a/lib/BUILD b/lib/BUILD index 992f7bd0a..f41ad162f 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -153,7 +153,7 @@ java_library( "//org.eclipse.jgit:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@bcpg-jdk15on//jar"], + exports = ["@bcpg//jar"], ) java_library( @@ -162,7 +162,7 @@ java_library( "//org.eclipse.jgit:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@bcprov-jdk15on//jar"], + exports = ["@bcprov//jar"], ) java_library( @@ -171,7 +171,7 @@ java_library( "//org.eclipse.jgit:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@bcpkix-jdk15on//jar"], + exports = ["@bcpkix//jar"], ) java_library(