Upgrade guava to 32.1-jre

davido · davido · commit 1219bcd619c7 · 2023-09-28T13:32:47.000+02:00
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
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    check:
+      jobs:
+        - gitiles-build
diff --git a/WORKSPACE b/WORKSPACE
@@ -57,8 +57,8 @@ maven_jar(
 
 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(
 
 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(
diff --git a/java/com/google/gitiles/BUILD b/java/com/google/gitiles/BUILD
@@ -18,7 +18,8 @@ DEPS = [
     "//lib:jgit",
     "//lib:jgit-servlet",
     "//lib:slf4j-api",
-    "//lib/soy:soy",
+    "//lib/flogger",
+    "//lib/soy",
     "//java/com/google/gitiles/blame/cache",
 ]
 
diff --git a/javatests/com/google/gitiles/BUILD b/javatests/com/google/gitiles/BUILD
@@ -7,7 +7,8 @@ DEPS = [
     "//lib:guava-failureaccess",
     "//lib:jgit",
     "//lib:jgit-servlet",
-    "//lib/soy:soy",
+    "//lib/flogger",
+    "//lib/soy",
 ]
 
 java_library(
diff --git a/lib/flogger/BUILD 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",
+    ],
+)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +- project:
 +    check:
 +      jobs:
 +        - gitiles-build
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ DEPS = [`
`18`	`18`	`"//lib:jgit",`
`19`	`19`	`"//lib:jgit-servlet",`
`20`	`20`	`"//lib:slf4j-api",`
`21`		`- "//lib/soy:soy",`
	`21`	`+ "//lib/flogger",`
	`22`	`+ "//lib/soy",`
`22`	`23`	`"//java/com/google/gitiles/blame/cache",`
`23`	`24`	`]`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ DEPS = [`
`7`	`7`	`"//lib:guava-failureaccess",`
`8`	`8`	`"//lib:jgit",`
`9`	`9`	`"//lib:jgit-servlet",`
`10`		`- "//lib/soy:soy",`
	`10`	`+ "//lib/flogger",`
	`11`	`+ "//lib/soy",`
`11`	`12`	`]`
`12`	`13`
`13`	`14`	`java_library(`