Bazel: Remove version suffix from servlet-api-3_1 rule
This makes this artifact upgrade friendly.
Bug: Issue 12865
Change-Id: I37459989f83d6c362c656b870e87743cd3374378
diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt
index 9936aea..e94f297 100644
--- a/Documentation/licenses.txt
+++ b/Documentation/licenses.txt
@@ -100,8 +100,8 @@
* j2objc
* jsr305
* mime-util
-* servlet-api-3_1
-* servlet-api-3_1-without-neverlink
+* servlet-api
+* servlet-api-without-neverlink
* soy
[[Apache2_0_license]]
diff --git a/WORKSPACE b/WORKSPACE
index d1eadf0..23b275b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -156,7 +156,7 @@
)
maven_jar(
- name = "servlet-api-3_1",
+ name = "servlet-api",
artifact = "org.apache.tomcat:tomcat-servlet-api:8.5.23",
sha1 = "021a212688ec94fe77aff74ab34cc74f6f940e60",
)
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index 0e5d040..f7c0aee 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -41,7 +41,7 @@
"//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",
@@ -118,7 +118,7 @@
"//lib:gson",
"//lib:guava-retrying",
"//lib:jsch",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib/commons:lang",
"//lib/greenmail",
"//lib/guice",
diff --git a/java/com/google/gerrit/common/BUILD b/java/com/google/gerrit/common/BUILD
index 717f585..3b3d9c6 100644
--- a/java/com/google/gerrit/common/BUILD
+++ b/java/com/google/gerrit/common/BUILD
@@ -26,7 +26,7 @@
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gwtorm",
"//lib:guava",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/flogger:api",
diff --git a/java/com/google/gerrit/extensions/BUILD b/java/com/google/gerrit/extensions/BUILD
index 0022584..b5e5863 100644
--- a/java/com/google/gerrit/extensions/BUILD
+++ b/java/com/google/gerrit/extensions/BUILD
@@ -16,7 +16,7 @@
exports = [
":api",
"//lib:guava",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD
index 96c56c8..1d4189f 100644
--- a/java/com/google/gerrit/httpd/BUILD
+++ b/java/com/google/gerrit/httpd/BUILD
@@ -33,7 +33,7 @@
"//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",
diff --git a/java/com/google/gerrit/httpd/auth/oauth/BUILD b/java/com/google/gerrit/httpd/auth/oauth/BUILD
index e201e59..2d9345f 100644
--- a/java/com/google/gerrit/httpd/auth/oauth/BUILD
+++ b/java/com/google/gerrit/httpd/auth/oauth/BUILD
@@ -15,7 +15,7 @@
"//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib/commons:codec",
"//lib/flogger:api",
"//lib/guice",
diff --git a/java/com/google/gerrit/httpd/auth/openid/BUILD b/java/com/google/gerrit/httpd/auth/openid/BUILD
index cd204e7..2206397 100644
--- a/java/com/google/gerrit/httpd/auth/openid/BUILD
+++ b/java/com/google/gerrit/httpd/auth/openid/BUILD
@@ -18,7 +18,7 @@
"//java/com/google/gerrit/server",
"//lib:guava",
"//java/com/google/gwtorm",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib/commons:codec",
"//lib/flogger:api",
"//lib/guice",
diff --git a/java/com/google/gerrit/httpd/init/BUILD b/java/com/google/gerrit/httpd/init/BUILD
index de94a1a..97475d1 100644
--- a/java/com/google/gerrit/httpd/init/BUILD
+++ b/java/com/google/gerrit/httpd/init/BUILD
@@ -26,7 +26,7 @@
"//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",
diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD
index adc13f7..a8690b9 100644
--- a/java/com/google/gerrit/pgm/BUILD
+++ b/java/com/google/gerrit/pgm/BUILD
@@ -52,7 +52,7 @@
"//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",
diff --git a/java/com/google/gerrit/pgm/http/jetty/BUILD b/java/com/google/gerrit/pgm/http/jetty/BUILD
index e1e1a0b..9d65ded 100644
--- a/java/com/google/gerrit/pgm/http/jetty/BUILD
+++ b/java/com/google/gerrit/pgm/http/jetty/BUILD
@@ -16,7 +16,7 @@
"//java/com/google/gerrit/util/logging",
"//lib:gson",
"//lib:guava",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
diff --git a/java/com/google/gerrit/server/BUILD b/java/com/google/gerrit/server/BUILD
index d2b7584..9e7f3dd 100644
--- a/java/com/google/gerrit/server/BUILD
+++ b/java/com/google/gerrit/server/BUILD
@@ -93,7 +93,7 @@
"//lib:juniversalchardet",
"//lib:mime-util",
"//lib:protobuf",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib:soy",
"//lib:tukaani-xz",
"//lib/auto:auto-value",
diff --git a/java/com/google/gerrit/server/api/BUILD b/java/com/google/gerrit/server/api/BUILD
index 89b1370..37e04bb 100644
--- a/java/com/google/gerrit/server/api/BUILD
+++ b/java/com/google/gerrit/server/api/BUILD
@@ -17,7 +17,7 @@
"//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",
diff --git a/java/com/google/gerrit/server/audit/BUILD b/java/com/google/gerrit/server/audit/BUILD
index f666746..c8b71a9 100644
--- a/java/com/google/gerrit/server/audit/BUILD
+++ b/java/com/google/gerrit/server/audit/BUILD
@@ -54,7 +54,7 @@
"//lib:juniversalchardet",
"//lib:mime-util",
"//lib:protobuf",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib:soy",
"//lib:tukaani-xz",
"//lib/auto:auto-value",
diff --git a/java/com/google/gerrit/server/restapi/BUILD b/java/com/google/gerrit/server/restapi/BUILD
index c482019..dfb95940 100644
--- a/java/com/google/gerrit/server/restapi/BUILD
+++ b/java/com/google/gerrit/server/restapi/BUILD
@@ -29,7 +29,7 @@
"//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",
diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD
index 7de7551..f6f9b52 100644
--- a/java/com/google/gerrit/sshd/BUILD
+++ b/java/com/google/gerrit/sshd/BUILD
@@ -27,7 +27,7 @@
"//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",
diff --git a/java/com/google/gerrit/util/http/BUILD b/java/com/google/gerrit/util/http/BUILD
index 5ecb7a1..fbd1379 100644
--- a/java/com/google/gerrit/util/http/BUILD
+++ b/java/com/google/gerrit/util/http/BUILD
@@ -4,5 +4,5 @@
name = "http",
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
- deps = ["//lib:servlet-api-3_1"],
+ deps = ["//lib:servlet-api"],
)
diff --git a/javatests/com/google/gerrit/httpd/BUILD b/javatests/com/google/gerrit/httpd/BUILD
index adf072e..f2c8ded 100644
--- a/javatests/com/google/gerrit/httpd/BUILD
+++ b/javatests/com/google/gerrit/httpd/BUILD
@@ -14,7 +14,7 @@
"//lib:guava",
"//lib:jimfs",
"//lib:junit",
- "//lib:servlet-api-3_1-without-neverlink",
+ "//lib:servlet-api-without-neverlink",
"//lib:soy",
"//lib/easymock",
"//lib/guice",
diff --git a/javatests/com/google/gerrit/util/http/BUILD b/javatests/com/google/gerrit/util/http/BUILD
index 2999fc0..8f6afbb 100644
--- a/javatests/com/google/gerrit/util/http/BUILD
+++ b/javatests/com/google/gerrit/util/http/BUILD
@@ -8,7 +8,7 @@
"//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/easymock",
"//lib/truth",
],
diff --git a/javatests/com/google/gerrit/util/http/testutil/BUILD b/javatests/com/google/gerrit/util/http/testutil/BUILD
index 6acc7ca..d7ac5bd 100644
--- a/javatests/com/google/gerrit/util/http/testutil/BUILD
+++ b/javatests/com/google/gerrit/util/http/testutil/BUILD
@@ -7,7 +7,7 @@
visibility = ["//visibility:public"],
deps = [
"//lib:guava",
- "//lib:servlet-api-3_1",
+ "//lib:servlet-api",
"//lib/httpcomponents:httpclient",
"//lib/jgit/org.eclipse.jgit:jgit",
],
diff --git a/lib/BUILD b/lib/BUILD
index 7271026..2ea8f54 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -14,18 +14,18 @@
)
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(
diff --git a/plugins/BUILD b/plugins/BUILD
index 3ec5404..b9776ea 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -88,7 +88,7 @@
"//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",
]
