commit 1219bcd619c7178bbc723f574262e44371426771
author David Ostrovsky <david@ostrovsky.org> Sun Jan 30 16:05:13 2022 +0100
committer David Ostrovsky <david@ostrovsky.org> Thu Sep 28 13:32:47 2023 +0200
tree 7fdae1d6d50f1fa95eaf24bb6d25f1c62ae7514e
parent b911eb36af394d49c4bfaf6de522ff6544d650c3

Upgrade guava to 32.1-jre

Also update closure-template:soy to a new release: 2022-07-20.

New version of closure-template:soy depends on flogger:google-extensions
artifact, that is added here.

Change-Id: Icacbf6aee00d35d2ec6829ac2cd5e04437702435

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..0758980
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    check:
+      jobs:
+        - gitiles-build

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index ff06b2b..d04ed9e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -57,8 +57,8 @@
 
 maven_jar(
     name = "guava",
-    artifact = "com.google.guava:guava:30.1-jre",
-    sha1 = "00d0c3ce2311c9e36e73228da25a6e99b2ab826f",
+    artifact = "com.google.guava:guava:32.1.2-jre",
+    sha1 = "5e64ec7e056456bef3a4bc4c6fdaef71e8ab6318",
 )
 
 maven_jar(
@@ -128,8 +128,40 @@
 
 maven_jar(
     name = "soy",
-    artifact = "com.google.template:soy:2021-02-01",
-    sha1 = "8e833744832ba88059205a1e30e0898f925d8cb5",
+    artifact = "com.google.template:soy:2022-07-20",
+    sha1 = "f64eb90da6d91beddf11653865c90f26d26710cf",
+)
+
+FLOGGER_VERS = "0.7.4"
+
+maven_jar(
+    name = "log4j",
+    artifact = "ch.qos.reload4j:reload4j:1.2.18.0",
+    sha1 = "03b2b708403ab00eb0678bffdbbd567070bbdfab",
+)
+
+maven_jar(
+    name = "flogger",
+    artifact = "com.google.flogger:flogger:" + FLOGGER_VERS,
+    sha1 = "cec29ed8b58413c2e935d86b12d6b696dc285419",
+)
+
+maven_jar(
+    name = "flogger-log4j-backend",
+    artifact = "com.google.flogger:flogger-log4j-backend:" + FLOGGER_VERS,
+    sha1 = "7486b1c0138647cd7714eccb8ce37b5f2ae20a76",
+)
+
+maven_jar(
+    name = "flogger-google-extensions",
+    artifact = "com.google.flogger:google-extensions:" + FLOGGER_VERS,
+    sha1 = "c49493bd815e3842b8406e21117119d560399977",
+)
+
+maven_jar(
+    name = "flogger-system-backend",
+    artifact = "com.google.flogger:flogger-system-backend:" + FLOGGER_VERS,
+    sha1 = "4bee7ebbd97c63ca7fb17529aeb49a57b670d061",
 )
 
 maven_jar(

java/com/google/gitiles/BUILD

diff --git a/java/com/google/gitiles/BUILD b/java/com/google/gitiles/BUILD
index 4b0850a..427ef17 100644
--- a/java/com/google/gitiles/BUILD
+++ b/java/com/google/gitiles/BUILD
@@ -18,7 +18,8 @@
     "//lib:jgit",
     "//lib:jgit-servlet",
     "//lib:slf4j-api",
-    "//lib/soy:soy",
+    "//lib/flogger",
+    "//lib/soy",
     "//java/com/google/gitiles/blame/cache",
 ]
 

javatests/com/google/gitiles/BUILD

diff --git a/javatests/com/google/gitiles/BUILD b/javatests/com/google/gitiles/BUILD
index 8e90e16..cf5572f 100644
--- a/javatests/com/google/gitiles/BUILD
+++ b/javatests/com/google/gitiles/BUILD
@@ -7,7 +7,8 @@
     "//lib:guava-failureaccess",
     "//lib:jgit",
     "//lib:jgit-servlet",
-    "//lib/soy:soy",
+    "//lib/flogger",
+    "//lib/soy",
 ]
 
 java_library(

lib/flogger/BUILD

diff --git a/lib/flogger/BUILD b/lib/flogger/BUILD
new file mode 100644
index 0000000..06fb211
--- /dev/null
+++ b/lib/flogger/BUILD
@@ -0,0 +1,13 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+java_library(
+    name = "flogger",
+    visibility = ["//visibility:public"],
+    exports = [
+        "@flogger-google-extensions//jar",
+        "@flogger-log4j-backend//jar",
+        "@flogger-system-backend//jar",
+        "@flogger//jar",
+        "@log4j//jar",
+    ],
+)