Skip to content

Commit 5510823

Browse files
sjvanrossumsjvanrossum
authored
Merge branch 'main' into main
2 parents 05b5f19 + 67a89e2 commit 5510823

File tree

78 files changed

+8511
-407
lines changed

Some content is hidden

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

78 files changed

+8511
-407
lines changed

‎.github/release-please.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,8 @@ branches:
3333
- bumpMinorPreMajor: true
3434
handleGHRelease: true
3535
releaseType: java-backport
36-
branch: 1.23.x
36+
branch: 1.23.x
37+
- bumpMinorPreMajor: true
38+
handleGHRelease: true
39+
releaseType: java-backport
40+
branch: 1.33.x

‎.github/sync-repo-settings.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,18 @@ branchProtectionRules:
117117
requiredApprovingReviewCount: 1
118118
requiresCodeOwnerReviews: true
119119
requiresStrictStatusChecks: true
120+
- pattern: 1.33.x
121+
isAdminEnforced: true
122+
requiredStatusCheckContexts:
123+
- dependencies (17)
124+
- lint
125+
- clirr
126+
- units (8)
127+
- units (11)
128+
- cla/google
129+
requiredApprovingReviewCount: 1
130+
requiresCodeOwnerReviews: true
131+
requiresStrictStatusChecks: true
120132
permissionRules:
121133
- team: Googlers
122134
permission: pull

‎.github/workflows/ci.yaml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@ jobs:
3636
- run: .kokoro/build.sh
3737
env:
3838
JOB_TYPE: test
39+
units-logging:
40+
runs-on: ubuntu-latest
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
java: [11, 17, 21]
45+
steps:
46+
- uses: actions/checkout@v4
47+
- uses: actions/setup-java@v4
48+
with:
49+
distribution: temurin
50+
java-version: ${{matrix.java}}
51+
- run: java -version
52+
- run: .kokoro/build.sh
53+
env:
54+
JOB_TYPE: test-logging
3955
units-java8:
4056
# Building using Java 17 and run the tests with Java 8 runtime
4157
name: "units (8)"
@@ -104,7 +120,7 @@ jobs:
104120
- uses: actions/setup-java@v4
105121
with:
106122
distribution: temurin
107-
java-version: 11
123+
java-version: 17
108124
- run: java -version
109125
- run: .kokoro/build.sh
110126
env:

‎.github/workflows/members.json‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
[
2+
{"login":"renovate-bot"},
3+
{"login":"release-please[bot]"},
4+
{"login":"cloud-java-bot"},
5+
{"login":"gcf-owl-bot[bot]"},
6+
{"login":"dependabot[bot]"},
7+
{"login":"yoshi-code-bot"},
8+
{"login":"yoshi-automation"},
9+
{"login":"suztomo"},
10+
{"login":"dangazineu"},
11+
{"login":"ldetmer"},
12+
{"login":"zhumin8"},
13+
{"login":"blakeli0"},
14+
{"login":"lqiu96"},
15+
{"login":"jinseopkim0"},
16+
{"login":"meltsufin"},
17+
{"login":"diegomarquezp"},
18+
{"login":"burkedavison"},
19+
{"login":"mpeddada1"},
20+
{"login":"JoeWang1127"},
21+
{"login":"kmaydeo"},
22+
{"login":"lsirac"},
23+
{"login":"sakthivelmanii"},
24+
{"login":"rahul2393"},
25+
{"login":"surbhigarg92"},
26+
{"login":"alkatrivedi"},
27+
{"login":"olavloite"},
28+
{"login":"harshachinta"},
29+
{"login":"dazuma"},
30+
{"login":"quartzmo"},
31+
{"login":"codyoss"},
32+
{"login":"BrennaEpp"},
33+
{"login":"tritone"},
34+
{"login":"bisun-google"},
35+
{"login":"linchin"},
36+
{"login":"ohmayr"},
37+
{"login":"parthea"},
38+
{"login":"vchudnov-g"},
39+
{"login":"scotthart"},
40+
{"login":"dbolduc"},
41+
{"login":"cuiy0006"},
42+
{"login":"andrewsg"},
43+
{"login":"BenWhitehead"},
44+
{"login":"danielduhh"},
45+
{"login":"vishwarajanand"},
46+
{"login":"bajajneha27"},
47+
{"login":"JesseLovelace"},
48+
{"login":"cojenco"},
49+
{"login":"ddelgrosso1"},
50+
{"login":"sydney-munro"},
51+
{"login":"marcoa6"},
52+
{"login":"jskeet"},
53+
{"login":"glaforge"},
54+
{"login":"cwest"},
55+
{"login":"engelke"},
56+
{"login":"fhinkel"},
57+
{"login":"briandorsey"},
58+
{"login":"palladius"},
59+
{"login":"callingshotgun"},
60+
{"login":"muncus"},
61+
{"login":"darylducharme"},
62+
{"login":"grayside"},
63+
{"login":"koverholt"},
64+
{"login":"wietsevenema"},
65+
{"login":"ankurkotwal"},
66+
{"login":"ksprashu"},
67+
{"login":"arbrown"},
68+
{"login":"momander"},
69+
{"login":"donmccasland"},
70+
{"login":"glasnt"},
71+
{"login":"rsamborski"},
72+
{"login":"meteatamel"},
73+
{"login":"iennae"},
74+
{"login":"rominirani"},
75+
{"login":"kazunori279"},
76+
{"login":"davidcavazos"},
77+
{"login":"bourgeoisor"},
78+
{"login":"minherz"},
79+
{"login":"vladkol"},
80+
{"login":"kaslin"},
81+
{"login":"LukeSchlangen"},
82+
{"login":"billyjacobson"},
83+
{"login":"msampathkumar"},
84+
{"login":"polong-lin"},
85+
{"login":"villasenor"},
86+
{"login":"alphinside"},
87+
{"login":"telpirion"},
88+
{"login":"ZackAkil"},
89+
{"login":"joeshirey"},
90+
{"login":"m-strzelczyk"},
91+
{"login":"NimJay"},
92+
{"login":"saraford"},
93+
{"login":"kweinmeister"},
94+
{"login":"Mukamik"},
95+
{"login":"holtskinner"},
96+
{"login":"Neenu1995"},
97+
{"login":"Deleplace"},
98+
{"login":"Sita04"},
99+
{"login":"AbiramiSukumaran"},
100+
{"login":"moficodes"},
101+
{"login":"amanda-tarafa"},
102+
{"login":"aliciawilliams"},
103+
{"login":"jeffonelson"},
104+
{"login":"GabeWeiss"},
105+
{"login":"h3xar0n"},
106+
{"login":"katiemn"},
107+
{"login":"iamthuya"},
108+
{"login":"bradmiro"},
109+
{"login":"PicardParis"},
110+
{"login":"gotochkin"},
111+
{"login":"jesuispy"},
112+
{"login":"hyunuk"},
113+
{"login":"rachael-ds"},
114+
{"login":"eaball35"},
115+
{"login":"alokpattani"},
116+
{"login":"dandhlee"},
117+
{"login":"duncantech"},
118+
{"login":"inardini"},
119+
{"login":"lavinigam-gcp"},
120+
{"login":"gericdong"},
121+
{"login":"priyapandeyb"},
122+
{"login":"erwinh85"},
123+
{"login":"CadillacBurgess1"},
124+
{"login":"julieqiu"},
125+
{"login":"coryan"},
126+
{"login":"devoncarew"},
127+
{"login":"sai-sunder-s"},
128+
{"login":"harkamaljot"},
129+
{"login":"mrfaizal"},
130+
{"login":"suzmue"}
131+
]

‎.github/workflows/multi_approvers.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: 'multi-approvers'
2+
3+
on:
4+
pull_request:
5+
types:
6+
- 'opened'
7+
- 'edited'
8+
- 'reopened'
9+
- 'synchronize'
10+
- 'ready_for_review'
11+
- 'review_requested'
12+
- 'review_request_removed'
13+
pull_request_review:
14+
types:
15+
- 'submitted'
16+
- 'dismissed'
17+
18+
permissions:
19+
actions: 'write'
20+
contents: 'read'
21+
pull-requests: 'read'
22+
23+
concurrency:
24+
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
25+
cancel-in-progress: true
26+
27+
jobs:
28+
multi-approvers:
29+
uses: 'abcxyz/pkg/.github/workflows/multi-approvers.yml@1d1cedf7768d17dde23bb2cda24bc1fb950e9f92'
30+
with:
31+
org-members-path: 'googleapis/google-auth-library-java/main/.github/workflows/members.json'

‎.github/workflows/sonar.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
build:
1010
name: Build
1111
runs-on: ubuntu-22.04
12+
# Sonar Token can't be passed to PRs from forks. Disable Sonar workflow unless PR is from a branch.
13+
if: github.event.pull_request.head.repo.full_name == github.repository
1214
steps:
1315
- uses: actions/checkout@v4
1416
with:
@@ -36,10 +38,11 @@ jobs:
3638
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3739
run: |
3840
mvn -B verify -Dcheckstyle.skip \
41+
-Djacoco.skip=true \
3942
-DenableFullTestCoverage \
4043
-Dsonar.coverage.jacoco.xmlReportPaths=oauth2_http/target/site/jacoco/jacoco.xml \
4144
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
42-
-Pcoverage \
4345
-Dsonar.projectKey=googleapis_google-auth-library-java \
4446
-Dsonar.organization=googleapis \
45-
-Dsonar.host.url=https://sonarcloud.io
47+
-Dsonar.host.url=https://sonarcloud.io
48+

‎.kokoro/build.sh‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,13 @@ test)
5151
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
5252
RETURN_CODE=$?
5353
;;
54+
test-logging)
55+
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
56+
mvn clean test -P '!slf4j2x,slf4j2x-test' -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
57+
RETURN_CODE=$?
58+
;;
5459
lint)
55-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
60+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
5661
RETURN_CODE=$?
5762
;;
5863
javadoc)
@@ -66,18 +71,16 @@ integration)
6671
-DtrimStackTrace=false \
6772
-Dclirr.skip=true \
6873
-Denforcer.skip=true \
74+
-Djacoco.skip=true \
6975
-fae \
7076
verify
7177
RETURN_CODE=$?
7278
;;
73-
graalvmA)
74-
# Run Unit and Integration Tests with Native Image
75-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
76-
RETURN_CODE=$?
77-
;;
78-
graalvmB)
79+
graalvm)
7980
# Run Unit and Integration Tests with Native Image
80-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
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'
8184
RETURN_CODE=$?
8285
;;
8386
samples)

‎.kokoro/dependencies.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ retry_with_backoff 3 10 \
5454
mvn install -B -V -ntp \
5555
-DskipTests=true \
5656
-Dmaven.javadoc.skip=true \
57+
-Djacoco.skip=true \
5758
-Dclirr.skip=true
5859

5960
mvn -B dependency:analyze -DfailOnWarning=true

‎.kokoro/populate-secrets.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,19 @@ mkdir -p ${SECRET_LOCATION}
2828
for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
2929
do
3030
msg "Retrieving secret ${key}"
31-
docker run --entrypoint=gcloud \
32-
--volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
33-
gcr.io/google.com/cloudsdktool/cloud-sdk \
34-
secrets versions access latest \
31+
if [[ "${JOB_TYPE}" == *"graalvm"* ]]; then
32+
gcloud secrets versions access latest \
3533
--project cloud-devrel-kokoro-resources \
36-
--secret ${key} > \
37-
"${SECRET_LOCATION}/${key}"
34+
--secret ${key} > "${SECRET_LOCATION}/${key}"
35+
else
36+
docker run --entrypoint=gcloud \
37+
--volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
38+
gcr.io/google.com/cloudsdktool/cloud-sdk \
39+
secrets versions access latest \
40+
--project cloud-devrel-kokoro-resources \
41+
--secret ${key} > \
42+
"${SECRET_LOCATION}/${key}"
43+
fi
3844
if [[ $? == 0 ]]; then
3945
msg "Secret written to ${SECRET_LOCATION}/${key}"
4046
else

‎.kokoro/presubmit/common.cfg‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,3 @@ env_vars: {
2323
key: "JOB_TYPE"
2424
value: "test"
2525
}
26-
27-
before_action {
28-
fetch_keystore {
29-
keystore_resource {
30-
keystore_config_id: 73713
31-
keyname: "dpebot_codecov_token"
32-
}
33-
}
34-
}

0 commit comments

Comments
 (0)