Merge "Add java-prettify submodule"
diff --git a/.gitmodules b/.gitmodules
index b339fa4..ddfec8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "modules/jgit"]
path = modules/jgit
url = ../jgit
+[submodule "modules/java-prettify"]
+ path = modules/java-prettify
+ url = ../java-prettify
diff --git a/WORKSPACE b/WORKSPACE
index 1395239..d0e9e4e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -27,6 +27,12 @@
path = "modules/jgit",
)
+# Java-Prettify external repository consumed from git submodule
+local_repository(
+ name = "java-prettify",
+ path = "modules/java-prettify",
+)
+
register_toolchains("//tools:error_prone_warnings_toolchain_java11_definition")
register_toolchains("//tools:error_prone_warnings_toolchain_java17_definition")
@@ -68,13 +74,6 @@
sha1 = "f7be08ec23c21485b9b5a1cf1654c2ec8c58168d",
)
-# When upgrading prettify it should also be updated in plugins/gitiles
-maven_jar(
- name = "prettify",
- artifact = "com.github.twalcari:java-prettify:1.2.2",
- sha1 = "b8ba1c1eb8b2e45cfd465d01218c6060e887572e",
-)
-
COMMONMARK_VERSION = "0.10.0"
# When upgrading commonmark it should also be updated in plugins/gitiles
diff --git a/lib/BUILD b/lib/BUILD
index a0dfa57..4fec826 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -21,7 +21,6 @@
"gson",
"guava",
"guava-failureaccess",
- "prettify",
"ow2-asm",
"ow2-asm-analysis",
"ow2-asm-commons",
@@ -30,6 +29,12 @@
]]
java_library(
+ name = "prettify",
+ visibility = ["//visibility:public"],
+ exports = ["@java-prettify"],
+)
+
+java_library(
name = "slf4j-api",
exports = ["@log-api//jar"],
)
diff --git a/modules/java-prettify b/modules/java-prettify
new file mode 160000
index 0000000..54d1c6c
--- /dev/null
+++ b/modules/java-prettify
@@ -0,0 +1 @@
+Subproject commit 54d1c6c735a92cad8c67cb4c9fcd1d090605c88e
