Skip to content

Commit fdf20ea

Browse files
authored
deps: upgrade google-java-format to 1.13.0 (#1288)
* deps: upgrade google-java-format to 1.11.0 Fixes #1287 google-java-format 1.11.0 is the version used by fmt-maven-plugin 2.12 (latest as of November 2021). * ci: owlbot to use Java 11 * formatter version through the java-shared-config * updating container_test.yaml
1 parent 7a7c48f commit fdf20ea

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

docker/owlbot/java/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313
# limitations under the License.
1414

1515
# build from the root of this repo:
16-
FROM gcr.io/cloud-devrel-public-resources/java8
16+
FROM gcr.io/cloud-devrel-public-resources/java11
1717

18-
ARG JAVA_FORMAT_VERSION=1.7
18+
# The formatter version used by the fmt-maven-plugin through the
19+
# google-cloud-shared-config.
20+
# https://github.com/googleapis/java-shared-config/blob/main/pom.xml#L228
21+
ARG JAVA_FORMAT_VERSION=1.13.0
1922

2023
RUN apt-get install -y --no-install-recommends jq
2124

docker/owlbot/java/container_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ commandTests:
1717
- name: "version"
1818
command: ["java", "-version"]
1919
# java -version outputs to stderr...
20-
expectedError: ["(java|openjdk) version \"1.8.*\""]
20+
expectedError: ["(java|openjdk) version \"11.*\""]
2121
- name: "formatter"
2222
command: ["java", "-jar", "/owlbot/google-java-format.jar", "--version"]
23-
expectedError: ["google-java-format: Version 1.7"]
23+
expectedError: ["google-java-format: Version 1.13.0"]
2424
- name: "python"
2525
command: ["python", "--version"]
2626
expectedOutput: ["Python 3.6.1"]

0 commit comments

Comments
 (0)