Skip to content

Commit 1219bcd

Browse files
committed
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
1 parent b911eb3 commit 1219bcd

5 files changed

Lines changed: 57 additions & 6 deletions

File tree

.zuul.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- project:
2+
check:
3+
jobs:
4+
- gitiles-build

WORKSPACE

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ maven_jar(
5757

5858
maven_jar(
5959
name = "guava",
60-
artifact = "com.google.guava:guava:30.1-jre",
61-
sha1 = "00d0c3ce2311c9e36e73228da25a6e99b2ab826f",
60+
artifact = "com.google.guava:guava:32.1.2-jre",
61+
sha1 = "5e64ec7e056456bef3a4bc4c6fdaef71e8ab6318",
6262
)
6363

6464
maven_jar(
@@ -128,8 +128,40 @@ maven_jar(
128128

129129
maven_jar(
130130
name = "soy",
131-
artifact = "com.google.template:soy:2021-02-01",
132-
sha1 = "8e833744832ba88059205a1e30e0898f925d8cb5",
131+
artifact = "com.google.template:soy:2022-07-20",
132+
sha1 = "f64eb90da6d91beddf11653865c90f26d26710cf",
133+
)
134+
135+
FLOGGER_VERS = "0.7.4"
136+
137+
maven_jar(
138+
name = "log4j",
139+
artifact = "ch.qos.reload4j:reload4j:1.2.18.0",
140+
sha1 = "03b2b708403ab00eb0678bffdbbd567070bbdfab",
141+
)
142+
143+
maven_jar(
144+
name = "flogger",
145+
artifact = "com.google.flogger:flogger:" + FLOGGER_VERS,
146+
sha1 = "cec29ed8b58413c2e935d86b12d6b696dc285419",
147+
)
148+
149+
maven_jar(
150+
name = "flogger-log4j-backend",
151+
artifact = "com.google.flogger:flogger-log4j-backend:" + FLOGGER_VERS,
152+
sha1 = "7486b1c0138647cd7714eccb8ce37b5f2ae20a76",
153+
)
154+
155+
maven_jar(
156+
name = "flogger-google-extensions",
157+
artifact = "com.google.flogger:google-extensions:" + FLOGGER_VERS,
158+
sha1 = "c49493bd815e3842b8406e21117119d560399977",
159+
)
160+
161+
maven_jar(
162+
name = "flogger-system-backend",
163+
artifact = "com.google.flogger:flogger-system-backend:" + FLOGGER_VERS,
164+
sha1 = "4bee7ebbd97c63ca7fb17529aeb49a57b670d061",
133165
)
134166

135167
maven_jar(

java/com/google/gitiles/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ DEPS = [
1818
"//lib:jgit",
1919
"//lib:jgit-servlet",
2020
"//lib:slf4j-api",
21-
"//lib/soy:soy",
21+
"//lib/flogger",
22+
"//lib/soy",
2223
"//java/com/google/gitiles/blame/cache",
2324
]
2425

javatests/com/google/gitiles/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ DEPS = [
77
"//lib:guava-failureaccess",
88
"//lib:jgit",
99
"//lib:jgit-servlet",
10-
"//lib/soy:soy",
10+
"//lib/flogger",
11+
"//lib/soy",
1112
]
1213

1314
java_library(

lib/flogger/BUILD

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
load("@rules_java//java:defs.bzl", "java_library")
2+
3+
java_library(
4+
name = "flogger",
5+
visibility = ["//visibility:public"],
6+
exports = [
7+
"@flogger-google-extensions//jar",
8+
"@flogger-log4j-backend//jar",
9+
"@flogger-system-backend//jar",
10+
"@flogger//jar",
11+
"@log4j//jar",
12+
],
13+
)

0 commit comments

Comments
 (0)