Bug fixes to bazel publishing

Change-Id: I3c235a1ba009b998035e6d0db85818308cf0ecde
diff --git a/tools/build/bazel/osgi_java_library.bzl b/tools/build/bazel/osgi_java_library.bzl
index 523224c..d1b86d3 100644
--- a/tools/build/bazel/osgi_java_library.bzl
+++ b/tools/build/bazel/osgi_java_library.bzl
@@ -474,7 +474,7 @@
 
     # rule for building javadocs
     if not suppress_javadocs:
-      javadoc(name = name + "-javadocs", deps = deps, srcs = srcs, visibility = visibility)
+      javadoc(name = name + "-javadoc", deps = deps, srcs = srcs, visibility = visibility)
 
     if test_srcs != []:
         native.java_library(
diff --git a/tools/build/bazel/publish_catalog.bzl b/tools/build/bazel/publish_catalog.bzl
index 7f0db76..b36559f 100644
--- a/tools/build/bazel/publish_catalog.bzl
+++ b/tools/build/bazel/publish_catalog.bzl
@@ -26,7 +26,7 @@
 
     c = artifact_id.split("-")
 
-    if len(c) > 1 and c[len(c)-1] in ("javadocs", "sources", "tests", "pom"):
+    if len(c) > 1 and c[len(c)-1] in ("javadoc", "sources", "tests", "pom"):
         classifier = c[len(c)-1]
         artifact_id = "-".join(c[:len(c)-1])
         if classifier == "pom":