Drop deprecated fields from JavaInfo

 - `transitive_deps` is an alias for `transitive_compile_time_jars`
 - `transitive_runtime_deps` is an alias for `transitive_runtime_jars`

RELNOTES[INC]: Drop deprecated 'transitive_deps', 'transitive_runtime_deps' from JavaInfo

PiperOrigin-RevId: 555098491
Change-Id: I9edf7d4c82b69a8016d2bcde0fdb57f7d82cacf5

Author: hvadehra

src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java

@@ -362,12 +362,19 @@ public boolean isNeverlink() {
 
   @Override
   public Depset /*<Artifact>*/ getTransitiveRuntimeJars() {
-    return getTransitiveRuntimeDeps();
+    return Depset.of(
+        Artifact.class,
+        getProviderAsNestedSet(
+            JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::getRuntimeJars));
   }
 
   @Override
   public Depset /*<Artifact>*/ getTransitiveCompileTimeJars() {
-    return getTransitiveDeps();
+    return Depset.of(
+        Artifact.class,
+        getProviderAsNestedSet(
+            JavaCompilationArgsProvider.class,
+            JavaCompilationArgsProvider::getTransitiveCompileTimeJars));
   }
 
   @Override
@@ -430,22 +437,9 @@ public ImmutableList<Artifact> getDirectRuntimeJars() {
     return directRuntimeJars;
   }
 
-  @Override
-  public Depset /*<Artifact>*/ getTransitiveDeps() {
-    return Depset.of(
-        Artifact.class,
-        getProviderAsNestedSet(
-            JavaCompilationArgsProvider.class,
-            JavaCompilationArgsProvider::getTransitiveCompileTimeJars));
-  }
+  /*<Artifact>*/
 
-  @Override
-  public Depset /*<Artifact>*/ getTransitiveRuntimeDeps() {
-    return Depset.of(
-        Artifact.class,
-        getProviderAsNestedSet(
-            JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::getRuntimeJars));
-  }
+  /*<Artifact>*/
 
   @Override
   public Depset /*<Artifact>*/ getTransitiveSourceJars() {

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaInfoApi.java

@@ -122,24 +122,6 @@ public interface JavaInfoApi<
       structField = true)
   Sequence<FileT> getRuntimeOutputJars();
 
-  @StarlarkMethod(
-      name = "transitive_deps",
-      doc =
-          "Deprecated: Please use <code><a class=\"anchor\" "
-              + "href=\"#transitive_compile_time_jars\">JavaInfo.transitive_compile_time_jars</a></code>"
-              + " instead. It returns the same value.",
-      structField = true)
-  Depset /*<FileT>*/ getTransitiveDeps();
-
-  @StarlarkMethod(
-      name = "transitive_runtime_deps",
-      doc =
-          "Deprecated: please use <code><a class=\"anchor\""
-              + " href=\"#transitive_runtime_jars\">JavaInfo.transitive_runtime_jars"
-              + "</a></code> instead. It returns the same value",
-      structField = true)
-  Depset /*<FileT>*/ getTransitiveRuntimeDeps();
-
   @StarlarkMethod(
       name = "transitive_source_jars",
       doc =

src/main/starlark/builtins_bzl/common/java/java_info.bzl

@@ -152,9 +152,7 @@ def merge(
     java_outputs = depset(java_outputs).to_list()
     result = {
         "transitive_runtime_jars": transitive_runtime_jars,
-        "transitive_runtime_deps": transitive_runtime_jars,  # deprecated
         "transitive_compile_time_jars": transitive_compile_time_jars,
-        "transitive_deps": transitive_compile_time_jars,  # deprecated
         "compile_jars": depset(order = "preorder", transitive = compile_jars),
         "full_compile_jars": depset(order = "preorder", transitive = full_compile_jars),
         "_transitive_full_compile_time_jars": depset(order = "preorder", transitive = _transitive_full_compile_time_jars),
@@ -204,9 +202,7 @@ def to_java_binary_info(java_info):
     """
     result = {
         "transitive_runtime_jars": depset(),
-        "transitive_runtime_deps": depset(),  # deprecated
         "transitive_compile_time_jars": depset(),
-        "transitive_deps": depset(),  # deprecated
         "compile_jars": depset(),
         "full_compile_jars": depset(),
         "_transitive_full_compile_time_jars": depset(),
@@ -449,7 +445,6 @@ def java_info_for_compilation(
     result.update(
         runtime_output_jars = direct_runtime_jars,
         transitive_runtime_jars = transitive_runtime_jars,
-        transitive_runtime_deps = transitive_runtime_jars,
         transitive_source_jars = depset(
             direct = [source_jar],
             # only differs from the usual java_info.transitive_source_jars in the order of deps
@@ -566,7 +561,6 @@ def _javainfo_init_base(
     )]
     result = {
         "transitive_compile_time_jars": transitive_compile_time_jars,
-        "transitive_deps": transitive_compile_time_jars,  # deprecated
         "compile_jars": depset(
             order = "preorder",
             direct = [compile_jar] if compile_jar else [],
@@ -724,7 +718,6 @@ def _javainfo_init(
         )
     result.update(
         transitive_runtime_jars = transitive_runtime_jars,
-        transitive_runtime_deps = transitive_runtime_jars,  # deprecated
         transitive_source_jars = depset(
             direct = [source_jar] if source_jar else [],
             # TODO(hvd): native also adds source jars from deps, but this should be unnecessary
@@ -770,8 +763,6 @@ JavaInfo, _new_javainfo = provider(
         "outputs": "Deprecated: use java_outputs.",
         "annotation_processing": "Deprecated: Please use plugins instead.",
         "runtime_output_jars": "([File]) A list of runtime Jars created by this Java/Java-like target.",
-        "transitive_deps": "Deprecated: Please use transitive_compile_time_jars instead.",
-        "transitive_runtime_deps": "Deprecated: please use transitive_runtime_jars instead.",
         "transitive_source_jars": "(depset[File]) The Jars of all source files in the transitive closure.",
         "transitive_native_libraries": """(depset[LibraryToLink]) The transitive set of CC native
                 libraries required by the target.""",

src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java

@@ -1843,7 +1843,7 @@ public void testJavaInfoGetTransitiveDeps() throws Exception {
         "foo/extension.bzl",
         "result = provider()",
         "def _impl(ctx):",
-        "  return [result(property = ctx.attr.dep[JavaInfo].transitive_deps)]",
+        "  return [result(property = ctx.attr.dep[JavaInfo].transitive_compile_time_jars)]",
         "my_rule = rule(_impl, attrs = { 'dep' : attr.label() })");
 
     scratch.file(
@@ -1875,7 +1875,7 @@ public void testJavaInfoGetTransitiveRuntimeDeps() throws Exception {
         "foo/extension.bzl",
         "result = provider()",
         "def _impl(ctx):",
-        "  return [result(property = ctx.attr.dep[JavaInfo].transitive_runtime_deps)]",
+        "  return [result(property = ctx.attr.dep[JavaInfo].transitive_runtime_jars)]",
         "my_rule = rule(_impl, attrs = { 'dep' : attr.label() })");
 
     scratch.file(

src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java

@@ -318,7 +318,7 @@ public void testJavaProtosExposeStarlarkProviders() throws Exception {
         /* doAnalysis= */ true,
         new EventBus());
     // Implicitly check that `update()` above didn't throw an exception. This implicitly checks that
-    // ctx.attr.dep.java.{transitive_deps, outputs}, above, is defined.
+    // ctx.attr.dep.java.{transitive_compile_time_jars, outputs}, above, is defined.
   }
 
   @Test