Rename some build rules to meet expectation in JGit bazel build
This is a preparation to link JGit as a submodule instead of an
external Maven build dependency.
Change-Id: Icd470c32b6b0447b480bc494ea5ebf558c24e34c
diff --git a/BUILD b/BUILD
index d65fe65..3d84a08 100644
--- a/BUILD
+++ b/BUILD
@@ -6,7 +6,7 @@
libs = [
"//lib/jetty:server",
"//lib/jetty:servlet",
- "//lib/slf4j:slf4j-simple",
+ "//lib:slf4j-simple",
"//java/com/google/gitiles:servlet",
],
web_xml = "//resources:web_xml",
diff --git a/WORKSPACE b/WORKSPACE
index 6359814..0739533 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -106,7 +106,7 @@
)
maven_jar(
- name = "servlet-api_3_1",
+ name = "servlet-api",
artifact = "javax.servlet:javax.servlet-api:3.1.0",
sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c",
)
@@ -181,7 +181,7 @@
)
maven_jar(
- name = "ewah",
+ name = "javaewah",
artifact = "com.googlecode.javaewah:JavaEWAH:1.1.7",
sha1 = "570dde3cd706ae10c62fe19b150928cfdb415e87",
)
@@ -218,7 +218,7 @@
SL_VERS = "1.7.26"
maven_jar(
- name = "slf4j-api",
+ name = "log-api",
artifact = "org.slf4j:slf4j-api:" + SL_VERS,
sha1 = "77100a62c2e6f04b53977b9f541044d7d722693d",
)
diff --git a/java/com/google/gitiles/BUILD b/java/com/google/gitiles/BUILD
index a105f38..de70adb 100644
--- a/java/com/google/gitiles/BUILD
+++ b/java/com/google/gitiles/BUILD
@@ -17,7 +17,7 @@
"//lib:prettify",
"//lib/jgit:jgit",
"//lib/jgit:jgit-servlet",
- "//lib/slf4j:slf4j-api",
+ "//lib:slf4j-api",
"//lib/soy:soy",
"//java/com/google/gitiles/blame/cache",
]
diff --git a/java/com/google/gitiles/dev/BUILD b/java/com/google/gitiles/dev/BUILD
index 9550cf0..942cb2b 100644
--- a/java/com/google/gitiles/dev/BUILD
+++ b/java/com/google/gitiles/dev/BUILD
@@ -9,13 +9,13 @@
"//lib:guava",
"//lib:guava-failureaccess",
"//lib:html-types",
- "//lib:servlet-api_3_1",
+ "//lib:servlet-api",
"//lib/jetty:server",
"//lib/jetty:servlet",
"//lib/jgit",
"//lib/jgit:jgit-servlet",
- "//lib/slf4j:slf4j-api",
- "//lib/slf4j:slf4j-simple",
+ "//lib:slf4j-api",
+ "//lib:slf4j-simple",
"//lib/soy",
],
)
diff --git a/lib/BUILD b/lib/BUILD
index a6f026f..282643d 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -18,7 +18,7 @@
"html-types",
"jsr305",
"servlet-api_2_5",
- "servlet-api_3_1",
+ "servlet-api",
"gson",
"guava",
"guava-failureaccess",
@@ -29,3 +29,16 @@
"ow2-asm-tree",
"ow2-asm-util",
]]
+
+java_library(
+ name = "slf4j-api",
+ exports = ["@log-api//jar"],
+)
+
+java_library(
+ name = "slf4j-simple",
+ runtime_deps = [
+ ":slf4j-api",
+ "@slf4j-simple//jar",
+ ],
+)
diff --git a/lib/jetty/BUILD b/lib/jetty/BUILD
index 4f58b3d..521fd22 100644
--- a/lib/jetty/BUILD
+++ b/lib/jetty/BUILD
@@ -8,7 +8,7 @@
name = "servlet",
exports = [
":security",
- "//lib:servlet-api_3_1", # Different from the rest of gitiles-server.
+ "//lib:servlet-api", # Different from the rest of gitiles-server.
"@servlet//jar",
],
)
diff --git a/lib/slf4j/BUILD b/lib/slf4j/BUILD
deleted file mode 100644
index 2719aa8..0000000
--- a/lib/slf4j/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
-package(
- default_visibility = ["//visibility:public"],
-)
-
-java_library(
- name = "slf4j-api",
- exports = ["@slf4j-api//jar"],
-)
-
-java_library(
- name = "slf4j-simple",
- runtime_deps = [
- ":slf4j-api",
- "@slf4j-simple//jar",
- ],
-)
