Bump guice version to 6.0.0

Guice 6.x release is adding support for jakarta.inject, see this issue
for more details: [1]. Guice release 7.0.0 will remove support for
javax.inject annotation and only support jakarta.inject.

Also add new dependency to jakarta.inject library.

[1] google/guice#1383

Release-Notes: Update guice version to 6.0.0
Change-Id: I0eb5320289bde532ac57bdd376802b37c1cee47f

Documentation/licenses.txt

@@ -63,6 +63,7 @@ Apache2.0
 * guice:guice-assistedinject
 * guice:guice-library
 * guice:guice-servlet
+* guice:jakarta-inject
 * guice:javax_inject
 * httpcomponents:httpclient
 * httpcomponents:httpcore

lib/guice/BUILD

@@ -6,6 +6,7 @@ java_library(
     visibility = ["//visibility:public"],
     exports = [
         ":guice-library",
+        ":jakarta-inject",
         ":javax_inject",
     ],
 )
@@ -40,6 +41,13 @@ java_library(
     exports = ["@aopalliance//jar"],
 )
 
+java_library(
+    name = "jakarta-inject",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jakarta-inject-api//jar"],
+)
+
 java_library(
     name = "javax_inject",
     data = ["//lib:LICENSE-Apache2.0"],

tools/deps.bzl

@@ -68,6 +68,12 @@ def java_dependencies():
         sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c",
     )
 
+    maven_jar(
+        name = "jakarta-inject-api",
+        artifact = "jakarta.inject:jakarta.inject-api:2.0.1",
+        sha1 = "4c28afe1991a941d7702fe1362c365f0a8641d1e",
+    )
+
     # JGit's transitive dependencies
 
     maven_jar(

tools/nongoogle.bzl

@@ -177,24 +177,24 @@ def declare_nongoogle_deps():
         sha1 = GUAVA_TESTLIB_BIN_SHA1,
     )
 
-    GUICE_VERS = "5.1.0"
+    GUICE_VERS = "6.0.0"
 
     maven_jar(
         name = "guice-library",
         artifact = "com.google.inject:guice:" + GUICE_VERS,
-        sha1 = "da25056c694c54ba16e78e4fc35f17fc60f0d1b4",
+        sha1 = "9b422c69c4fa1ea95b2615444a94fede9b02fc40",
     )
 
     maven_jar(
         name = "guice-assistedinject",
         artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
-        sha1 = "58a8956f00d6939978d7da735f393d7af7db5c02",
+        sha1 = "849d991e4adf998cb9877124fe74b063c88726cf",
     )
 
     maven_jar(
         name = "guice-servlet",
         artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS,
-        sha1 = "cb89ddec4246a469698a3461e69de1f245016c5d",
+        sha1 = "1a505f5f1a269e01946790e863178a5055de4fa0",
     )
 
     # Keep this version of Soy synchronized with the version used in Gitiles.