Skip to content

Commit

Permalink
deps: upgrade google-java-format to 1.13.0 (#1288)
Browse files Browse the repository at this point in the history
* deps: upgrade google-java-format to 1.11.0

Fixes googleapis/synthtool#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
Source-Link: googleapis/synthtool@fdf20ea
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:55d5d3c72e1c065f018e423e122a22fb55c8daa36f6f17f540774779ed659ab9
  • Loading branch information
gcf-owl-bot[bot] committed Nov 29, 2021
1 parent 8972f81 commit bf5a6e8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:5b8c790f57cca57e6b37ba25f79291265c218cea3e6ba9714b001910ab3f1419
digest: sha256:55d5d3c72e1c065f018e423e122a22fb55c8daa36f6f17f540774779ed659ab9
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public class DefaultCredentialProviderTest extends TestCase {
+ "SXagBxzp8PecbaCHjzNRSQE2in81qYnrAFNB4o3DpHyMMY6s5ALLeHKscEWnqP8Ur6X4PvzZecCWU9BKAZAkAut"
+ "LPknAuxSCsUOvUfS1i87ex77Ot+w6POp34pEX+UWb+u5iFn2cQacDTHLV1LtE80L8jVLSbrbrlH43H0DjU5AkEA"
+ "gidhycxS86dxpEljnOMCw8CKoUBd5I880IUahEiUltk7OLJYS/Ts1wbn3kPOVX3wyJs8WBDtBkFrDHW2ezth2QJ"
+ "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ"
+ "==\n-----END PRIVATE KEY-----\n";
+ "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ==\n"
+ "-----END PRIVATE KEY-----\n";
private static final String ACCESS_TOKEN = "1/MkSJoj1xsli0AccessToken_NKPY2";

private static final String GAE_SIGNAL_CLASS = "com.google.appengine.api.utils.SystemProperty";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public class GoogleCredentialTest extends TestCase {
+ "SXagBxzp8PecbaCHjzNRSQE2in81qYnrAFNB4o3DpHyMMY6s5ALLeHKscEWnqP8Ur6X4PvzZecCWU9BKAZAkAut"
+ "LPknAuxSCsUOvUfS1i87ex77Ot+w6POp34pEX+UWb+u5iFn2cQacDTHLV1LtE80L8jVLSbrbrlH43H0DjU5AkEA"
+ "gidhycxS86dxpEljnOMCw8CKoUBd5I880IUahEiUltk7OLJYS/Ts1wbn3kPOVX3wyJs8WBDtBkFrDHW2ezth2QJ"
+ "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ"
+ "==\n-----END PRIVATE KEY-----\n";
+ "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ==\n"
+ "-----END PRIVATE KEY-----\n";
private static final String SA_KEY_ID = "key_id";

public void testRefreshToken_ServiceAccounts() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ public void testFrom_errorEmptyContentButWithJsonContentType() throws Exception
public void testFrom_detailsErrorObject() throws Exception {
HttpTransport transport =
new ErrorTransport(
"{\"error\": {\"message\": \"invalid_token\"}, \"error_description\": \"Invalid value\"}",
"{\"error\": {\"message\": \"invalid_token\"}, \"error_description\": \"Invalid"
+ " value\"}",
Json.MEDIA_TYPE);
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
Expand Down

0 comments on commit bf5a6e8

Please sign in to comment.