Rename servlet-api-3_1 to match Gerrit master

JGit is built from source on Gerrit-CI: the Bazel build
dependencies need to be aligned. On Gerrit master the servlet-api-3_1
is renamed to servlet-api (see [1]): do the same on the JGit master
branch.

In addition, removing the version suffix from dependency rule makes
it much easier to upgrade. The actual reason the for the renaming it
in Gerrit core is upgrade attempt to servlet-api 4.0, done in [2].

[1] https://gerrit-review.googlesource.com/c/gerrit/+/238496
[2] https://gerrit-review.googlesource.com/c/gerrit/+/238383

Change-Id: I63c506da335deef54eb279879e897b427200797b
Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>

diff --git a/WORKSPACE b/WORKSPACE
index 86e12b607e276096c3dfe2dd45d5c18268500e1f..9f707d872afe9aa6a0e93e4a90b39818f6e99059 100644 (file)
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -100,7 +100,7 @@ maven_jar(
 )
 
 maven_jar(
-    name = "servlet-api-3_1",
+    name = "servlet-api",
     artifact = "javax.servlet:javax.servlet-api:3.1.0",
     sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c",
 )

diff --git a/lib/BUILD b/lib/BUILD
index 93bb7319084ea0689bbc50e4b557f7e7b25c700b..058899fce665cdbee6f6e2fc64d55d9ccb0e72e3 100644 (file)
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -224,7 +224,7 @@ java_library(
         "//org.eclipse.jgit.lfs.server.test:__pkg__",
         "//org.eclipse.jgit.pgm:__pkg__",
     ],
-    exports = ["@servlet-api-3_1//jar"],
+    exports = ["@servlet-api//jar"],
 )
 
 java_library(