Bazel: Remove version suffix from servlet-api-3_1 rule

This makes this artifact upgrade friendly.

Change-Id: I37459989f83d6c362c656b870e87743cd3374378

Documentation/licenses.txt

@@ -99,8 +99,8 @@ Apache2.0
 * j2objc
 * jsr305
 * mime-util
-* servlet-api-3_1
+* servlet-api
-* servlet-api-3_1-without-neverlink
+* servlet-api-without-neverlink
 * soy
 
 [[Apache2_0_license]]

WORKSPACE

@@ -162,7 +162,7 @@ maven_jar(
 )
 
 maven_jar(
-    name = "servlet-api-3_1",
+    name = "servlet-api",
     artifact = "org.apache.tomcat:tomcat-servlet-api:8.5.23",
     sha1 = "021a212688ec94fe77aff74ab34cc74f6f940e60",
 )

java/com/google/gerrit/acceptance/BUILD

@@ -48,7 +48,7 @@ java_library(
         "//lib:h2",
         "//lib:jimfs",
         "//lib:jsch",
-        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib:servlet-api-without-neverlink",
         "//lib/bouncycastle:bcpg",
         "//lib/bouncycastle:bcprov",
         "//lib/commons:compress",
@@ -134,7 +134,7 @@ java_library2(
         "//lib:gson",
         "//lib:guava-retrying",
         "//lib:jsch",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/commons:lang",
         "//lib/greenmail",
         "//lib/guice",

java/com/google/gerrit/common/BUILD

@@ -25,7 +25,7 @@ java_library(
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/auto:auto-value",
         "//lib/auto:auto-value-annotations",
         "//lib/flogger:api",

java/com/google/gerrit/extensions/BUILD

@@ -16,7 +16,7 @@ java_library(
     exports = [
         ":api",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/guice",
         "//lib/guice:guice-assistedinject",
         "//lib/guice:guice-servlet",

java/com/google/gerrit/httpd/BUILD

@@ -34,7 +34,7 @@ java_library(
         "//lib:gson",
         "//lib:guava",
         "//lib:jsch",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib:soy",
         "//lib/auto:auto-value",
         "//lib/auto:auto-value-annotations",

java/com/google/gerrit/httpd/auth/oauth/BUILD

@@ -16,7 +16,7 @@ java_library(
         "//java/com/google/gerrit/server/audit",
         "//lib:gson",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/commons:codec",
         "//lib/flogger:api",
         "//lib/guice",

java/com/google/gerrit/httpd/auth/openid/BUILD

@@ -18,7 +18,7 @@ java_library(
         "//java/com/google/gerrit/server",
         "//java/com/google/gerrit/server/audit",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/commons:codec",
         "//lib/flogger:api",
         "//lib/guice",

java/com/google/gerrit/httpd/init/BUILD

@@ -28,7 +28,7 @@ java_library(
         "//java/com/google/gerrit/server/schema",
         "//java/com/google/gerrit/sshd",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/flogger:api",
         "//lib/guice",
         "//lib/guice:guice-servlet",

java/com/google/gerrit/pgm/BUILD

@@ -53,7 +53,7 @@ java_library(
         "//lib:args4j",
         "//lib:guava",
         "//lib:protobuf",
-        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib:servlet-api-without-neverlink",
         "//lib/auto:auto-value",
         "//lib/auto:auto-value-annotations",
         "//lib/flogger:api",

java/com/google/gerrit/pgm/http/jetty/BUILD

@@ -15,7 +15,7 @@ java_library(
         "//java/com/google/gerrit/sshd",
         "//java/com/google/gerrit/util/http",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/flogger:api",
         "//lib/guice",
         "//lib/guice:guice-assistedinject",

java/com/google/gerrit/server/BUILD

@@ -97,7 +97,7 @@ java_library(
         "//lib:juniversalchardet",
         "//lib:mime-util",
         "//lib:protobuf",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib:soy",
         "//lib:tukaani-xz",
         "//lib/auto:auto-value",

java/com/google/gerrit/server/api/BUILD

@@ -18,7 +18,7 @@ java_library(
         "//java/com/google/gerrit/util/cli",
         "//lib:args4j",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/guice",
         "//lib/guice:guice-assistedinject",
         "//lib/jgit/org.eclipse.jgit:jgit",

java/com/google/gerrit/server/audit/BUILD

@@ -60,7 +60,7 @@ java_library(
         "//lib:juniversalchardet",
         "//lib:mime-util",
         "//lib:protobuf",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib:soy",
         "//lib:tukaani-xz",
         "//lib/auto:auto-value",

java/com/google/gerrit/server/restapi/BUILD

@@ -31,7 +31,7 @@ java_library(
         "//lib:blame-cache",
         "//lib:gson",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/auto:auto-value",
         "//lib/auto:auto-value-annotations",
         "//lib/commons:codec",

java/com/google/gerrit/sshd/BUILD

@@ -29,7 +29,7 @@ java_library(
         "//lib:gson",
         "//lib:guava",
         "//lib:jsch",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/auto:auto-value",
         "//lib/auto:auto-value-annotations",
         "//lib/bouncycastle:bcprov-neverlink",

java/com/google/gerrit/util/http/BUILD

@@ -4,5 +4,5 @@ java_library(
     name = "http",
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
-    deps = ["//lib:servlet-api-3_1"],
+    deps = ["//lib:servlet-api"],
 )

javatests/com/google/gerrit/httpd/BUILD

@@ -17,7 +17,7 @@ junit_tests(
         "//lib:guava",
         "//lib:jimfs",
         "//lib:junit",
-        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib:servlet-api-without-neverlink",
         "//lib:soy",
         "//lib/guice",
         "//lib/guice:guice-servlet",

javatests/com/google/gerrit/util/http/BUILD

@@ -8,7 +8,7 @@ junit_tests(
         "//java/com/google/gerrit/util/http",
         "//javatests/com/google/gerrit/util/http/testutil",
         "//lib:junit",
-        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib:servlet-api-without-neverlink",
         "//lib/truth",
     ],
 )

javatests/com/google/gerrit/util/http/testutil/BUILD

@@ -8,7 +8,7 @@ java_library(
     deps = [
         "//java/com/google/gerrit/extensions:api",
         "//lib:guava",
-        "//lib:servlet-api-3_1",
+        "//lib:servlet-api",
         "//lib/httpcomponents:httpclient",
         "//lib/jgit/org.eclipse.jgit:jgit",
     ],

lib/BUILD

@@ -14,18 +14,18 @@ filegroup(
 )
 
 java_library(
-    name = "servlet-api-3_1",
+    name = "servlet-api",
     data = ["//lib:LICENSE-Apache2.0"],
     neverlink = 1,
     visibility = ["//visibility:public"],
-    exports = ["@servlet-api-3_1//jar"],
+    exports = ["@servlet-api//jar"],
 )
 
 java_library(
-    name = "servlet-api-3_1-without-neverlink",
+    name = "servlet-api-without-neverlink",
     data = ["//lib:LICENSE-Apache2.0"],
     visibility = ["//visibility:public"],
-    exports = ["@servlet-api-3_1//jar"],
+    exports = ["@servlet-api//jar"],
 )
 
 java_library(

plugins/BUILD

@@ -86,7 +86,7 @@ EXPORTS = [
     "//lib:jsch",
     "//lib:mime-util",
     "//lib:protobuf",
-    "//lib:servlet-api-3_1-without-neverlink",
+    "//lib:servlet-api-without-neverlink",
     "//lib:soy",
     "//prolog:gerrit-prolog-common",
 ]