Use gen_maven_artifact for dagger core library

RELNOTES=n/a
PiperOrigin-RevId: 602450093

2 files changed, 13 insertions, 17 deletions

diff --git a/java/dagger/BUILD b/java/dagger/BUILD
index 4675e3054..bbf7e24dd 100644
--- a/java/dagger/BUILD
+++ b/java/dagger/BUILD
@@ -22,8 +22,7 @@ load(
     "JAVA_RELEASE_MIN",
     "POM_VERSION",
 )
-load("//tools:maven.bzl", "pom_file")
-load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
+load("//tools:maven.bzl", "gen_maven_artifact")
 
 package(default_visibility = ["//:src"])
 
@@ -38,22 +37,19 @@ java_library(
     ],
 )
 
-pom_file(
-    name = "pom",
-    artifact_id = "dagger",
+gen_maven_artifact(
+    name = "artifact",
+    artifact_coordinates = "com.google.dagger:dagger:" + POM_VERSION,
     artifact_name = "Dagger",
-    targets = [":core"],
+    artifact_target = ":core",
+    artifact_target_maven_deps = [
+        "javax.inject:javax.inject",
+    ],
+    javadoc_root_packages = ["dagger"],
+    javadoc_srcs = [":javadoc-srcs"],
 )
 
 filegroup(
     name = "javadoc-srcs",
     srcs = glob(["**/*"]),
 )
-
-javadoc_library(
-    name = "core-javadoc",
-    srcs = [":javadoc-srcs"],
-    exclude_packages = ["dagger.internal"],
-    root_packages = ["dagger"],
-    deps = ["//third_party/java/jsr330_inject"],
-)
diff --git a/util/deploy-dagger.sh b/util/deploy-dagger.sh
index f024325bb..b0b68a8eb 100755
--- a/util/deploy-dagger.sh
+++ b/util/deploy-dagger.sh
@@ -37,10 +37,10 @@ _deploy() {
 
 _deploy \
   "" \
-  java/dagger/libcore.jar \
+  java/dagger/artifact.jar \
   java/dagger/pom.xml \
-  java/dagger/libcore-src.jar \
-  java/dagger/core-javadoc.jar \
+  java/dagger/artifact-src.jar \
+  java/dagger/artifact-javadoc.jar \
   "dagger"
 
 _deploy \