Finalize unbundled rules migration

Test: existing
Bug: 156497102
Change-Id: I99865482f4080546f2c07d83f4fe19b93dd5dba9

2 files changed, 12 insertions, 71 deletions

diff --git a/fest-swing/BUILD b/fest-swing/BUILD
index 8f00cea6..e818be6d 100644
--- a/fest-swing/BUILD
+++ b/fest-swing/BUILD
@@ -1,26 +1,25 @@
 load("//tools/base/bazel:bazel.bzl", "iml_module")
 
-# managed by go/iml_to_build [unb]
+# managed by go/iml_to_build
 iml_module(
     name = "fest-swing",
     srcs = ["src/main/java"],
     bundled_deps = [
-        "//tools/swing-testing/fest-swing/lib:unb.fest-reflect-2.0-SNAPSHOT",
-        "//tools/swing-testing/fest-swing/lib:unb.fest",
-        "//tools/swing-testing/fest-swing/lib:unb.jcip-annotations-1.0-1",
+        "//tools/swing-testing/fest-swing/lib:fest-reflect-2.0-SNAPSHOT",
+        "//tools/swing-testing/fest-swing/lib:fest",
+        "//tools/swing-testing/fest-swing/lib:jcip-annotations-1.0-1",
     ],
     iml_files = ["fest-swing.iml"],
     javacopts = ["-XepAllErrorsAsWarnings"],
-    project = "unb",
     visibility = ["//visibility:public"],
-    exports = ["//tools/swing-testing/fest-swing/lib:unb.fest-reflect-2.0-SNAPSHOT"],
+    exports = ["//tools/swing-testing/fest-swing/lib:fest-reflect-2.0-SNAPSHOT"],
     # do not sort: must match IML order
     deps = [
         "//prebuilts/studio/intellij-sdk:studio-sdk",
-        "//tools/swing-testing/fest-swing/lib:unb.fest-reflect-2.0-SNAPSHOT",
-        "//tools/swing-testing/fest-swing/lib:unb.fest",
-        "//tools/adt/idea/.idea/libraries:unb.mockito[test]",
-        "//tools/swing-testing/fest-swing/lib:unb.MultithreadedTC-1.01[test]",
-        "//tools/swing-testing/fest-swing/lib:unb.jcip-annotations-1.0-1",
+        "//tools/swing-testing/fest-swing/lib:fest-reflect-2.0-SNAPSHOT",
+        "//tools/swing-testing/fest-swing/lib:fest",
+        "//tools/adt/idea/.idea/libraries:mockito[test]",
+        "//tools/swing-testing/fest-swing/lib:MultithreadedTC-1.01[test]",
+        "//tools/swing-testing/fest-swing/lib:jcip-annotations-1.0-1",
     ],
 )
diff --git a/fest-swing/lib/BUILD b/fest-swing/lib/BUILD
index 7f882144..f11acf0e 100644
--- a/fest-swing/lib/BUILD
+++ b/fest-swing/lib/BUILD
@@ -7,27 +7,6 @@ java_import(
 
 # managed by go/iml_to_build
 java_import(
-    name = "fest-util-1.3.0-SNAPSHOT",
-    jars = ["fest-util-1.3.0-SNAPSHOT.jar"],
-    visibility = ["//visibility:public"],
-)
-
-# managed by go/iml_to_build
-java_import(
-    name = "fest-assert-1.5.0-SNAPSHOT",
-    jars = ["fest-assert-1.5.0-SNAPSHOT.jar"],
-    visibility = ["//visibility:public"],
-)
-
-# managed by go/iml_to_build
-java_import(
-    name = "annotations-13.0",
-    jars = ["annotations-13.0.jar"],
-    visibility = ["//visibility:public"],
-)
-
-# managed by go/iml_to_build
-java_import(
     name = "jcip-annotations-1.0-1",
     jars = ["jcip-annotations-1.0-1.jar"],
     visibility = ["//visibility:public"],
@@ -40,51 +19,14 @@ java_import(
     visibility = ["//visibility:public"],
 )
 
-# managed by go/iml_to_build [unb]
-java_import(
-    name = "unb.fest-reflect-2.0-SNAPSHOT",
-    jars = ["fest-reflect-2.0-SNAPSHOT.jar"],
-    tags = [
-        "manual",
-        "unb",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-# managed by go/iml_to_build [unb]
+# managed by go/iml_to_build
 java_import(
-    name = "unb.fest",
+    name = "fest",
     # do not sort: must match IML order
     jars = [
         "fest-assert-1.5.0-SNAPSHOT.jar",
         "fest-util-1.3.0-SNAPSHOT.jar",
         "annotations-13.0.jar",
     ],
-    tags = [
-        "manual",
-        "unb",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-# managed by go/iml_to_build [unb]
-java_import(
-    name = "unb.MultithreadedTC-1.01",
-    jars = ["MultithreadedTC-1.01.jar"],
-    tags = [
-        "manual",
-        "unb",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-# managed by go/iml_to_build [unb]
-java_import(
-    name = "unb.jcip-annotations-1.0-1",
-    jars = ["jcip-annotations-1.0-1.jar"],
-    tags = [
-        "manual",
-        "unb",
-    ],
     visibility = ["//visibility:public"],
 )