Bazel: Rename //lib:servlet-api to //lib:jakarta-servlet-api //lib:servlet-api exported the canonical Jakarta servlet API (jakarta.servlet:jakarta.servlet-api:6.1.0). The name did not distinguish it from //lib:javax-servlet-api, which the EE8 bridge in //org.eclipse.jgit.http.server.ee8 and //org.eclipse.jgit.lfs.server.ee8 uses to depend on javax.servlet:javax.servlet-api:4.0.1. Rename the canonical target to //lib:jakarta-servlet-api so the API flavour is self-evident at consumer sites. Migrate the six in-tree consumers (http.server, http.test, junit.http, lfs.server, lfs.server.test, pgm) in the same change. No compatibility alias is kept: JGit is consumed from source by Gerrit through a git submodule, which has its own //lib:* wrappers, and the EE8 bridge commit added //lib:javax-servlet-api without an alias for the same reason. Change-Id: I764b01d171d2c2dc55fecef89bf4b36ce1cb9c59
diff --git a/lib/BUILD b/lib/BUILD index 551383b..c065158 100644 --- a/lib/BUILD +++ b/lib/BUILD
@@ -309,7 +309,7 @@ ) java_library( - name = "servlet-api", + name = "jakarta-servlet-api", visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.server:__pkg__",
diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index a0dae48..cae8d88 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD
@@ -13,7 +13,7 @@ resource_strip_prefix = "org.eclipse.jgit.http.server/resources", resources = [":jgit-servlet-resources"], deps = [ - "//lib:servlet-api", + "//lib:jakarta-servlet-api", # We want these deps to be provided_deps "//org.eclipse.jgit:jgit", ],
diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index 732b4fa..bc04d22 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD
@@ -12,6 +12,7 @@ ":helpers", "//lib:commons-logging", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -19,7 +20,6 @@ "//lib:jetty-servlet", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//lib:slf4j-simple", "//org.eclipse.jgit.http.apache:http-apache", @@ -35,8 +35,8 @@ testonly = 1, srcs = glob(["src/**/*.java"]), deps = [ + "//lib:jakarta-servlet-api", "//lib:junit", - "//lib:servlet-api", "//org.eclipse.jgit:jgit", "//org.eclipse.jgit.junit:junit", ],
diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 87dcf3e..17a7570 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD
@@ -12,6 +12,7 @@ ), # TODO(davido): we want here provided deps deps = [ + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -20,7 +21,6 @@ "//lib:jetty-session", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.server:jgit-servlet", "//org.eclipse.jgit:jgit",
diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index 76a0870..adc2df6 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD
@@ -23,7 +23,7 @@ "//lib:jetty-servlet", "//lib:jetty-security", "//lib:jetty-util", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", ] junit_tests(
diff --git a/org.eclipse.jgit.lfs.server/BUILD b/org.eclipse.jgit.lfs.server/BUILD index cd1831b..c363d52 100644 --- a/org.eclipse.jgit.lfs.server/BUILD +++ b/org.eclipse.jgit.lfs.server/BUILD
@@ -10,7 +10,7 @@ deps = [ "//lib:gson", "//lib:httpcore", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit",
diff --git a/org.eclipse.jgit.pgm/BUILD b/org.eclipse.jgit.pgm/BUILD index a267b15..596aed2 100644 --- a/org.eclipse.jgit.pgm/BUILD +++ b/org.eclipse.jgit.pgm/BUILD
@@ -16,13 +16,13 @@ "//lib:commons-logging", "//lib:httpclient", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", "//lib:jetty-server", "//lib:jetty-servlet", "//lib:jetty-util", - "//lib:servlet-api", "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit",