Skip to content

Commit 047f391

Browse files
andyrzhaoandyrzhao
authored
Merge branch 'main' into main
2 parents d09ec5a + 8b0f921 commit 047f391

File tree

49 files changed

+1988
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1988
-157
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
- uses: actions/setup-java@v4
121121
with:
122122
distribution: temurin
123-
java-version: 11
123+
java-version: 17
124124
- run: java -version
125125
- run: .kokoro/build.sh
126126
env:

‎.github/workflows/members.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,7 @@
126126
{"login":"devoncarew"},
127127
{"login":"sai-sunder-s"},
128128
{"login":"harkamaljot"},
129-
{"login":"mrfaizal"}
129+
{"login":"mrfaizal"},
130+
{"login":"suzmue"},
131+
{"login":"viacheslav-rostovtsev"}
130132
]

‎.github/workflows/multi_approvers.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ concurrency:
2626

2727
jobs:
2828
multi-approvers:
29-
uses: 'abcxyz/pkg/.github/workflows/multi-approvers.yml@main'
29+
uses: 'abcxyz/pkg/.github/workflows/multi-approvers.yml@1d1cedf7768d17dde23bb2cda24bc1fb950e9f92'
3030
with:
3131
org-members-path: 'googleapis/google-auth-library-java/main/.github/workflows/members.json'

‎.kokoro/build.sh‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ test-logging)
5757
RETURN_CODE=$?
5858
;;
5959
lint)
60-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
60+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
6161
RETURN_CODE=$?
6262
;;
6363
javadoc)
@@ -76,14 +76,7 @@ integration)
7676
verify
7777
RETURN_CODE=$?
7878
;;
79-
graalvmA)
80-
# Run Unit and Integration Tests with Native Image
81-
bash .kokoro/populate-secrets.sh
82-
export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"
83-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test -Pslf4j2x test -pl 'oauth2_http'
84-
RETURN_CODE=$?
85-
;;
86-
graalvmB)
79+
graalvm)
8780
# Run Unit and Integration Tests with Native Image
8881
bash .kokoro/populate-secrets.sh
8982
export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"

‎.kokoro/presubmit/graalvm-native-a.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build_file: "google-auth-library-java/.kokoro/build.sh"
44

55
env_vars: {
66
key: "JOB_TYPE"
7-
value: "graalvmA"
7+
value: "graalvm"
88
}
99

1010
# TODO: remove this after we've migrated all tests and scripts
@@ -44,6 +44,6 @@ env_vars: {
4444
}
4545

4646
container_properties {
47-
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.15.0"
47+
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.15.4"
4848
}
4949

‎.kokoro/presubmit/graalvm-native-b.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build_file: "google-auth-library-java/.kokoro/build.sh"
44

55
env_vars: {
66
key: "JOB_TYPE"
7-
value: "graalvmB"
7+
value: "graalvm"
88
}
99

1010
# TODO: remove this after we've migrated all tests and scripts
@@ -44,5 +44,5 @@ env_vars: {
4444
}
4545

4646
container_properties {
47-
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.15.0"
47+
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.15.4"
4848
}

‎.kokoro/presubmit/graalvm-native-c.cfg‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
build_file: "google-auth-library-java/.kokoro/build.sh"
4+
5+
env_vars: {
6+
key: "JOB_TYPE"
7+
value: "graalvm"
8+
}
9+
10+
# TODO: remove this after we've migrated all tests and scripts
11+
env_vars: {
12+
key: "GCLOUD_PROJECT"
13+
value: "gcloud-devel"
14+
}
15+
16+
env_vars: {
17+
key: "GOOGLE_CLOUD_PROJECT"
18+
value: "gcloud-devel"
19+
}
20+
21+
env_vars: {
22+
key: "GOOGLE_APPLICATION_CREDENTIALS"
23+
value: "secret_manager/java-it-service-account"
24+
}
25+
26+
env_vars: {
27+
key: "SECRET_MANAGER_KEYS"
28+
value: "java-it-service-account"
29+
}
30+
31+
env_vars: {
32+
key: "GCS_BUCKET"
33+
value: "byoid-it-bucket"
34+
}
35+
36+
env_vars: {
37+
key: "GOOGLE_EXTERNAL_ACCOUNT_ALLOW_EXECUTABLES"
38+
value: "1"
39+
}
40+
41+
env_vars: {
42+
key: "GOOGLE_CLOUD_QUOTA_PROJECT"
43+
value: "gcloud-devel"
44+
}
45+
46+
container_properties {
47+
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:1.15.4"
48+
}
49+

‎.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.33.1"
2+
".": "1.35.0"
33
}

‎CHANGELOG.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
# Changelog
22

3+
## [1.35.0](https://github.com/googleapis/google-auth-library-java/compare/v1.34.0...v1.35.0) (2025-05-12)
4+
5+
6+
### Features
7+
8+
* Add support for mTLS authentication via X.509 certificates ([#1736](https://github.com/googleapis/google-auth-library-java/issues/1736)) ([b347603](https://github.com/googleapis/google-auth-library-java/commit/b347603db4deabb4eb34ed14b96178c95d3e7b45))
9+
* Return X509 certificate chain as the subject token. ([#1746](https://github.com/googleapis/google-auth-library-java/issues/1746)) ([6d05be8](https://github.com/googleapis/google-auth-library-java/commit/6d05be8e5cecf62ca0952bc3ef23c527c9e0d01d))
10+
11+
12+
### Bug Fixes
13+
14+
* Handle optional fields in ExternalAccountCredentials with null JSON value gracefully ([#1706](https://github.com/googleapis/google-auth-library-java/issues/1706)) ([f1f306d](https://github.com/googleapis/google-auth-library-java/commit/f1f306dffd874741663238283deed173ce02bea9))
15+
16+
## [1.34.0](https://github.com/googleapis/google-auth-library-java/compare/v1.33.1...v1.34.0) (2025-04-29)
17+
18+
19+
### Features
20+
21+
* Implement X509 certificate provider ([#1722](https://github.com/googleapis/google-auth-library-java/issues/1722)) ([4340684](https://github.com/googleapis/google-auth-library-java/commit/4340684fe29c9e9bffa90e88d0b1746f19b623ab))
22+
* Next release from main branch is 1.34.0 ([#1698](https://github.com/googleapis/google-auth-library-java/issues/1698)) ([fe43815](https://github.com/googleapis/google-auth-library-java/commit/fe4381513db1340190c4309a53c6265718682dde))
23+
* Next release from main branch is 1.34.0 ([#1702](https://github.com/googleapis/google-auth-library-java/issues/1702)) ([4507cf9](https://github.com/googleapis/google-auth-library-java/commit/4507cf9e17e7ff40cf142056d3929c87f5742dd1))
24+
25+
26+
### Bug Fixes
27+
28+
* Do not add padding in Client-Side CAB tokens. ([#1728](https://github.com/googleapis/google-auth-library-java/issues/1728)) ([8a75ccd](https://github.com/googleapis/google-auth-library-java/commit/8a75ccd1c09191abd8ebf463bc41810a38e185f5))
29+
330
## [1.33.1](https://github.com/googleapis/google-auth-library-java/compare/v1.33.0...v1.33.1) (2025-02-25)
431

532

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Code in this repo is formatted with
8484
[google-java-format](https://github.com/google/google-java-format).
8585
To run formatting on your project, you can run:
8686
```
87-
mvn com.coveo:fmt-maven-plugin:format
87+
mvn com.spotify.fmt:fmt-maven-plugin:format
8888
```
8989

9090
[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account

0 commit comments

Comments
 (0)