Skip to content

Commit

Permalink
Merge branch 'main' into renovate/org.apache.maven.plugins-maven-java…
Browse files Browse the repository at this point in the history
…doc-plugin-3.x
  • Loading branch information
lqiu96 committed Oct 18, 2023
2 parents e16de2f + 4c7a8d7 commit 12e6186
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:46d2d262cd285c638656c8bde468011b723dc0c7ffd6a5ecc2650fe639c82e8f
# created: 2023-07-24T14:21:17.707234503Z
digest: sha256:d0a8eb7ffc63ddce4c63191373d6e99d5385516423c396de207dedf2b6db7427
# created: 2023-10-17T17:33:29.360983119Z
1 change: 1 addition & 0 deletions .kokoro/nightly/java11-integration.cfg
Expand Up @@ -35,3 +35,4 @@ env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
}

13 changes: 7 additions & 6 deletions .kokoro/requirements.txt
Expand Up @@ -12,9 +12,9 @@ cachetools==5.3.1 \
--hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \
--hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b
# via google-auth
certifi==2023.5.7 \
--hash=sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7 \
--hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716
certifi==2023.7.22 \
--hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \
--hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9
# via requests
cffi==1.15.1 \
--hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
Expand Down Expand Up @@ -418,6 +418,7 @@ protobuf==3.20.3 \
# gcp-docuploader
# gcp-releasetool
# google-api-core
# googleapis-common-protos
pyasn1==0.5.0 \
--hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \
--hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde
Expand Down Expand Up @@ -469,9 +470,9 @@ typing-extensions==4.7.1 \
--hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
--hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
# via -r requirements.in
urllib3==1.26.16 \
--hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \
--hash=sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14
urllib3==1.26.17 \
--hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \
--hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b
# via
# google-auth
# requests
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog

## [1.20.0](https://github.com/googleapis/google-auth-library-java/compare/v1.19.0...v1.20.0) (2023-09-19)


### Features

* Byoid metrics framework ([#1232](https://github.com/googleapis/google-auth-library-java/issues/1232)) ([38bdf60](https://github.com/googleapis/google-auth-library-java/commit/38bdf60189b44171f5d481fa934f4ece60553653))


### Bug Fixes

* Make derived classes of CredentialSource public ([#1236](https://github.com/googleapis/google-auth-library-java/issues/1236)) ([9bb9e0a](https://github.com/googleapis/google-auth-library-java/commit/9bb9e0a67c503415a69f35e390f6c64357fc7be1))


### Documentation

* Update library definitions in README to the latest version ([#1239](https://github.com/googleapis/google-auth-library-java/issues/1239)) ([0c5cff2](https://github.com/googleapis/google-auth-library-java/commit/0c5cff26fc66ad90d2dbccd374c6ead81f66d569))

## [1.19.0](https://github.com/googleapis/google-auth-library-java/compare/v1.18.0...v1.19.0) (2023-06-27)


Expand Down
2 changes: 1 addition & 1 deletion appengine/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.19.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>1.19.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
<packaging>pom</packaging>
<name>Google Auth Library for Java BOM</name>
<description>
Expand Down
2 changes: 1 addition & 1 deletion credentials/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.19.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions oauth2_http/pom.xml
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.19.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>junit-platform-native</artifactId>
<version>0.9.25</version>
<version>0.9.27</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -58,7 +58,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>0.9.25</version>
<version>0.9.27</version>
<extensions>true</extensions>
<executions>
<execution>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.19.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.20.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<packaging>pom</packaging>
<name>Google Auth Library for Java</name>
<description>Client libraries providing authentication and
Expand Down Expand Up @@ -66,11 +66,11 @@
<project.google.http.version>1.43.3</project.google.http.version>
<project.junit.version>4.13.2</project.junit.version>
<project.guava.version>32.0.0-android</project.guava.version>
<project.appengine.version>2.0.17</project.appengine.version>
<project.appengine.version>2.0.21</project.appengine.version>
<project.findbugs.version>3.0.2</project.findbugs.version>
<deploy.autorelease>false</deploy.autorelease>
<project.autovalue.version>1.8.2</project.autovalue.version>
<auto-value-annotation.version>1.10.3</auto-value-annotation.version>
<auto-value-annotation.version>1.10.4</auto-value-annotation.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -285,7 +285,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<version>0.8.11</version>
<executions>
<execution>
<goals>
Expand Down
6 changes: 3 additions & 3 deletions samples/snippets/pom.xml
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.22.0</version>
<version>26.25.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -43,14 +43,14 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>

<!-- IAM dependency-->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-iam-admin</artifactId>
<version>3.18.0</version>
<version>3.23.0</version>
</dependency>

<!-- GCloud dependency-->
Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/src/test/java/SnippetsIT.java
Expand Up @@ -116,7 +116,7 @@ public void testIdTokenFromMetadataServer() throws GeneralSecurityException, IOE
@Test
public void testAuthenticateImplicitWithAdc() throws IOException {
AuthenticateImplicitWithAdc.authenticateImplicitWithAdc(PROJECT_ID);
assertThat(stdOut.toString()).contains("Listing instances complete");
assertThat(stdOut.toString()).contains("Listed all storage buckets.");
}

@Test
Expand Down
12 changes: 6 additions & 6 deletions versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version

google-auth-library:1.19.0:1.19.1-SNAPSHOT
google-auth-library-bom:1.19.0:1.19.1-SNAPSHOT
google-auth-library-parent:1.19.0:1.19.1-SNAPSHOT
google-auth-library-appengine:1.19.0:1.19.1-SNAPSHOT
google-auth-library-credentials:1.19.0:1.19.1-SNAPSHOT
google-auth-library-oauth2-http:1.19.0:1.19.1-SNAPSHOT
google-auth-library:1.20.0:1.20.1-SNAPSHOT
google-auth-library-bom:1.20.0:1.20.1-SNAPSHOT
google-auth-library-parent:1.20.0:1.20.1-SNAPSHOT
google-auth-library-appengine:1.20.0:1.20.1-SNAPSHOT
google-auth-library-credentials:1.20.0:1.20.1-SNAPSHOT
google-auth-library-oauth2-http:1.20.0:1.20.1-SNAPSHOT

0 comments on commit 12e6186

Please sign in to comment.