Install parallel google-java-format 1.5
To update the google-java-format to a newer version we have number of
prerequisites:
* Update CI docker image
* Update CI script to change invocation, as new version differs from
our gjf fork (--set-exit-if-changed must be passed now)
* Gerrit code must be adapted to pass the gjf check, to reflect last
change in gjf formatting rules.
To reduce the pain, we update the CI docker image already now, and
install gjf 1.3 (default) and 1.5 new version in parallel.
Test Plan:
* Build the CI docker image with this change
* Run the image
* Verifiy that both versions are installed:
jenkins@554f2a88a7b0:~$ ls -all format
total 12124
drwxr-xr-x 2 jenkins jenkins 4096 Jan 28 06:30 .
drwxr-xr-x 1 jenkins jenkins 4096 Jan 28 06:30 ..
lrwxrwxrwx 1 jenkins jenkins 22 Jan 28 06:30 google-java-format -> google-java-format-1.3
-rwxr-xr-x 1 jenkins jenkins 1017 Jan 28 06:30 google-java-format-1.3
-rw-r--r-- 2 jenkins jenkins 6670071 Jan 28 06:30 google-java-format-1.3-all-deps.jar
-rwxr-xr-x 1 jenkins jenkins 1017 Jan 28 06:30 google-java-format-1.5
-rw-r--r-- 2 jenkins jenkins 5714013 Jan 28 06:30 google-java-format-1.5-all-deps.jar
* Verifiy that the 1.3 (default) version still works as expected:
$ find java/com/google/gerrit -name "*.java" | xargs ~/format/google-java-format --dry-run
* Verify that the new version 1.5 works now:
$ find java/com/google/gerrit -name "*.java" | xargs ~/format/google-java-format-1.5 --dry-run --set-exit-if-changed
java/com/google/gerrit/server/rules/StoredValue.java
java/com/google/gerrit/server/notedb/ChangeNotesCache.java
java/com/google/gerrit/server/config/ProjectConfigEntry.java
java/com/google/gerrit/server/schema/MySql.java
java/com/google/gerrit/server/schema/Schema_105.java
java/com/google/gerrit/server/project/BooleanProjectConfigTransformations.java
java/com/google/gerrit/server/restapi/project/PutConfig.java
java/com/google/gerrit/server/update/RepoOnlyOp.java
java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java
java/com/google/gerrit/pgm/util/LogFileCompressor.java
java/com/google/gerrit/httpd/raw/StaticModule.java
$ echo $?
123
Change-Id: Ic97ed2456285fb17b4186ff2847b6a051160a501
1 file changed
