Merge branch 'stable-2.14'
* stable-2.14:
Upgrade API to 2.14.2
Change-Id: I4ad7a012e6ba9cb6f857e2ce59acc9f182409de0
diff --git a/bouncycastle.bzl b/bouncycastle.bzl
index f170d8a..9f503d0 100644
--- a/bouncycastle.bzl
+++ b/bouncycastle.bzl
@@ -5,23 +5,23 @@
"""
# This should be the same version used in Gerrit.
-BC_VERS = "1.56"
+BC_VERS = "1.57"
def bouncycastle_repos():
maven_jar(
name = "bouncycastle_bcprov",
artifact = "org.bouncycastle:bcprov-jdk15on:" + BC_VERS,
- sha1 = "a153c6f9744a3e9dd6feab5e210e1c9861362ec7",
+ sha1 = "f66a135611d42c992e5745788c3f94eb06464537",
)
maven_jar(
name = "bouncycastle_bcpg",
artifact = "org.bouncycastle:bcpg-jdk15on:" + BC_VERS,
- sha1 = "9c3f2e7072c8cc1152079b5c25291a9f462631f1",
+ sha1 = "7b2d587f5e3780b79e1d35af3e84d00634e9420b",
)
maven_jar(
name = "bouncycastle_bcpkix",
artifact = "org.bouncycastle:bcpkix-jdk15on:" + BC_VERS,
- sha1 = "4648af70268b6fdb24674fb1fd7c1fcc73db1231",
+ sha1 = "5c96e34bc9bd4cd6870e6d193a99438f1e274ca7",
)
native.bind(
name = 'bcprov',
diff --git a/gerrit_api_maven_local.bzl b/gerrit_api_maven_local.bzl
index 95c1f5f..b1fe421 100644
--- a/gerrit_api_maven_local.bzl
+++ b/gerrit_api_maven_local.bzl
@@ -5,7 +5,7 @@
gerrit_api is rule for fetching Gerrit plugin API using Bazel.
"""
-VER = "2.14.3-SNAPSHOT"
+VER = "2.15-SNAPSHOT"
def gerrit_api_maven_local():
bouncycastle_repos()
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index 48d047a..c34eba5 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -103,7 +103,7 @@
src = set()
lib = set()
- java_library = re.compile('bazel-out/local-fastbuild/bin(.*)/[^/]+[.]jar$')
+ java_library = re.compile('bazel-out/(?:.*)-fastbuild/bin(.*)/[^/]+[.]jar$')
srcs = re.compile('(.*/external/[^/]+)/jar/(.*)[.]jar')
for p in _query_classpath():
m = java_library.match(p)
