Merge branch 'main' into renovate/com.google.auth-google-auth-library…

…-oauth2-http-1.x
googleapis · Jul 25, 2023 · 2bc034a · 2bc034a
2 parents 2fc3274 + 701ceba
commit 2bc034a
Show file tree

Hide file tree

Showing 57 changed files with 1,572 additions and 538 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:a57d2ea6d1a77aa96c17ad0850b779ec6295f88b6c1da3d214b2095d140a2066
-
+  digest: sha256:af2eda87a54601ae7b7b2be5055c17b43ac98a7805b586772db314de8a7d4a1d
+# created: 2023-06-16T02:10:09.149325782Z
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -18,50 +18,51 @@ samples/**/*.java       @googleapis/java-samples-reviewers
 samples/snippets/generated/       @googleapis/yoshi-java
 
 # 3PI-related files and related base classes - joint ownership between googleapis-auth and aion-sdk
-java/com/google/auth/oauth2/ActingParty.java                      @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/AwsCredentials.java                   @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/AwsDates.java                         @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/AwsRequestSignature.java              @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/AwsRequestSigner.java                 @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/AwsSecurityCredentials.java           @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/CredentialAccessBoundary.java         @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/DefaultCredentialsProvider.java       @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/DownscopedCredentials.java            @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/EnvironmentProvider.java              @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/ExecutableHandler.java                @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/ExecutableResponse.java               @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/ExternalAccountCredentials.java       @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/GoogleCredentials.java                @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/IdentityPoolCredentials.java          @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/ImpersonatedCredentials.java          @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/OAuth2Credentials.java                @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/OAuth2CredentialsWithRefresh.java     @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/OAuthException.java                   @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/PluggableAuthCredentials.java         @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/PluggableAuthException.java           @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/PluggableAuthHandler.java             @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/StsRequestHandler.java                @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/StsTokenExchangeRequest.java          @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/StsTokenExchangeResponse.java         @googleapis/googleapis-auth @googleapis/aion-sdk
-java/com/google/auth/oauth2/SystemEnvironmentProvider.java        @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/AwsCredentialsTest.java                           @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/AwsRequestSignerTest.java                         @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/CredentialAccessBoundaryTest.java                 @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/DefaultCredentialsProviderTest.java               @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/DownscopedCredentialsTest.java                    @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/ExecutableResponseTest.java                       @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/ExternalAccountCredentialsTest.java               @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/ITDownscopingTest.java                            @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/ITWorkloadIdentityFederationTest.java             @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/IdentityPoolCredentialsTest.java                  @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/ImpersonatedCredentialsTest.java                  @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/MockExternalAccountCredentialsTransport.java      @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/MockStsTransport.java                             @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/OAuth2CredentialsTest.java                        @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/OAuth2CredentialsWithRefreshTest.java             @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/OAuthExceptionTest.java                           @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/PluggableAuthCredentialsTest.java                 @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/PluggableAuthExceptionTest.java                   @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/PluggableAuthHandlerTest.java                     @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/StsRequestHandlerTest.java                        @googleapis/googleapis-auth @googleapis/aion-sdk
-javatests/com/google/auth/TestEnvironmentProvider.java                      @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/ActingParty.java                      @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/AwsCredentials.java                   @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/AwsDates.java                         @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/AwsRequestSignature.java              @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/AwsRequestSigner.java                 @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/AwsSecurityCredentials.java           @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/CredentialAccessBoundary.java         @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/DefaultCredentialsProvider.java       @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/DownscopedCredentials.java            @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/EnvironmentProvider.java              @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/ExecutableHandler.java                @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/ExecutableResponse.java               @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java       @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java                @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/IdentityPoolCredentials.java          @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/ImpersonatedCredentials.java          @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/OAuth2Credentials.java                @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/OAuth2CredentialsWithRefresh.java     @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/OAuthException.java                   @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/PluggableAuthCredentials.java         @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/PluggableAuthException.java           @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/PluggableAuthHandler.java             @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/StsRequestHandler.java                @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/StsTokenExchangeRequest.java          @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/StsTokenExchangeResponse.java         @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/java/com/google/auth/oauth2/SystemEnvironmentProvider.java        @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/AwsCredentialsTest.java                           @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/AwsRequestSignerTest.java                         @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/CredentialAccessBoundaryTest.java                 @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/DefaultCredentialsProviderTest.java               @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/DownscopedCredentialsTest.java                    @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/ExecutableResponseTest.java                       @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/ExternalAccountCredentialsTest.java               @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/ITDownscopingTest.java                            @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/ITWorkloadIdentityFederationTest.java             @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/IdentityPoolCredentialsTest.java                  @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/ImpersonatedCredentialsTest.java                  @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/MockExternalAccountCredentialsTransport.java      @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/MockStsTransport.java                             @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/OAuth2CredentialsTest.java                        @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/OAuth2CredentialsWithRefreshTest.java             @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/OAuthExceptionTest.java                           @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/PluggableAuthCredentialsTest.java                 @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/PluggableAuthExceptionTest.java                   @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/PluggableAuthHandlerTest.java                     @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/StsRequestHandlerTest.java                        @googleapis/googleapis-auth @googleapis/aion-sdk
+oauth2_http/javatests/com/google/auth/TestEnvironmentProvider.java                      @googleapis/googleapis-auth @googleapis/aion-sdk
+README.md                                                                               @googleapis/googleapis-auth @googleapis/aion-sdk
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    # Disable version updates for Maven dependencies
+    # we use renovate-bot as well as shared-dependencies BOM to update maven dependencies.
+    ignore: "*"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    # Disable version updates for pip dependencies
+    # If a security vulnerability comes in, we will be notified about 
+    # it via template in the synthtool repository.
+    ignore: "*"
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -18,3 +18,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 1.12.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 1.6.x
diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
@@ -1 +1,2 @@
 enabled: true
+multiScmName: google-auth-library-java
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -68,6 +68,19 @@ branchProtectionRules:
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
+  - pattern: 1.6.x
+    isAdminEnforced: true
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - cla/google
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: true
 permissionRules:
   - team: Googlers
     permission: pull

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -71,12 +71,12 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
 graalvm17)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
 samples)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2"
 }
 
 env_vars: {

diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
@@ -1,34 +1,6 @@
-gcp-docuploader==0.6.3
-google-crc32c==1.3.0
-googleapis-common-protos==1.56.3
-gcp-releasetool==1.9.1
-cryptography==38.0.3
-cachetools==4.2.4
-cffi==1.15.1
-jeepney==0.7.1
-jinja2==3.0.3
-markupsafe==2.0.1
-keyring==23.4.1
-packaging==21.3
-protobuf==3.19.5
-pyjwt==2.4.0
-pyparsing==3.0.9
-pycparser==2.21
-pyperclip==1.8.2
-python-dateutil==2.8.2
-requests==2.27.1
-certifi==2022.9.24
-importlib-metadata==4.8.3
-zipp==3.6.0
-google_api_core==2.8.2
-google-cloud-storage==2.0.0
-google-resumable-media==2.3.3
-google-cloud-core==2.3.1
-typing-extensions==4.1.1
-urllib3==1.26.12
-zipp==3.6.0
-rsa==4.9
-six==1.16.0
-attrs==22.1.0
-google-auth==2.14.1
-idna==3.4
+gcp-docuploader
+gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x
+wheel
+setuptools
+typing-extensions
+click<8.1.0