Merge remote-tracking branch 'upstream/main' into negarb-x509

Author: nbayati

.github/release-please.yml

@@ -33,4 +33,8 @@ branches:
   - bumpMinorPreMajor: true
     handleGHRelease: true
     releaseType: java-backport
-    branch: 1.23.x
+    branch: 1.23.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 1.33.x

.github/sync-repo-settings.yaml

@@ -117,6 +117,18 @@ branchProtectionRules:
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
+  - pattern: 1.33.x
+    isAdminEnforced: true
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - cla/google
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: true
 permissionRules:
   - team: Googlers
     permission: pull

.github/workflows/ci.yaml

@@ -36,6 +36,22 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
+  units-logging:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [11, 17, 21]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test-logging
   units-java8:
     # Building using Java 17 and run the tests with Java 8 runtime
     name: "units (8)"

.github/workflows/members.json

@@ -1,6 +1,11 @@
 [
 {"login":"renovate-bot"},
-{"login":"release-please"},
+{"login":"release-please[bot]"},
+{"login":"cloud-java-bot"},
+{"login":"gcf-owl-bot[bot]"},
+{"login":"dependabot[bot]"},
+{"login":"yoshi-code-bot"},
+{"login":"yoshi-automation"},
 {"login":"suztomo"},
 {"login":"dangazineu"},
 {"login":"ldetmer"},
@@ -15,5 +20,112 @@
 {"login":"JoeWang1127"},
 {"login":"kmaydeo"},
 {"login":"lsirac"},
-{"login":"aeitzman"}
+{"login":"aeitzman"},
+{"login":"sakthivelmanii"},
+{"login":"rahul2393"},
+{"login":"surbhigarg92"},
+{"login":"alkatrivedi"},
+{"login":"olavloite"},
+{"login":"harshachinta"},
+{"login":"dazuma"},
+{"login":"quartzmo"},
+{"login":"codyoss"},
+{"login":"BrennaEpp"},
+{"login":"tritone"},
+{"login":"bisun-google"},
+{"login":"linchin"},
+{"login":"ohmayr"},
+{"login":"parthea"},
+{"login":"vchudnov-g"},
+{"login":"scotthart"},
+{"login":"dbolduc"},
+{"login":"cuiy0006"},
+{"login":"andrewsg"},
+{"login":"BenWhitehead"},
+{"login":"danielduhh"},
+{"login":"vishwarajanand"},
+{"login":"bajajneha27"},
+{"login":"JesseLovelace"},
+{"login":"cojenco"},
+{"login":"ddelgrosso1"},
+{"login":"sydney-munro"},
+{"login":"marcoa6"},
+{"login":"jskeet"},
+{"login":"glaforge"},
+{"login":"cwest"},
+{"login":"engelke"},
+{"login":"fhinkel"},
+{"login":"briandorsey"},
+{"login":"palladius"},
+{"login":"callingshotgun"},
+{"login":"muncus"},
+{"login":"darylducharme"},
+{"login":"grayside"},
+{"login":"koverholt"},
+{"login":"wietsevenema"},
+{"login":"ankurkotwal"},
+{"login":"ksprashu"},
+{"login":"arbrown"},
+{"login":"momander"},
+{"login":"donmccasland"},
+{"login":"glasnt"},
+{"login":"rsamborski"},
+{"login":"meteatamel"},
+{"login":"iennae"},
+{"login":"rominirani"},
+{"login":"kazunori279"},
+{"login":"davidcavazos"},
+{"login":"bourgeoisor"},
+{"login":"minherz"},
+{"login":"vladkol"},
+{"login":"kaslin"},
+{"login":"LukeSchlangen"},
+{"login":"billyjacobson"},
+{"login":"msampathkumar"},
+{"login":"polong-lin"},
+{"login":"villasenor"},
+{"login":"alphinside"},
+{"login":"telpirion"},
+{"login":"ZackAkil"},
+{"login":"joeshirey"},
+{"login":"m-strzelczyk"},
+{"login":"NimJay"},
+{"login":"saraford"},
+{"login":"kweinmeister"},
+{"login":"Mukamik"},
+{"login":"holtskinner"},
+{"login":"Neenu1995"},
+{"login":"Deleplace"},
+{"login":"Sita04"},
+{"login":"AbiramiSukumaran"},
+{"login":"moficodes"},
+{"login":"amanda-tarafa"},
+{"login":"aliciawilliams"},
+{"login":"jeffonelson"},
+{"login":"GabeWeiss"},
+{"login":"h3xar0n"},
+{"login":"katiemn"},
+{"login":"iamthuya"},
+{"login":"bradmiro"},
+{"login":"PicardParis"},
+{"login":"gotochkin"},
+{"login":"jesuispy"},
+{"login":"hyunuk"},
+{"login":"rachael-ds"},
+{"login":"eaball35"},
+{"login":"alokpattani"},
+{"login":"dandhlee"},
+{"login":"duncantech"},
+{"login":"inardini"},
+{"login":"lavinigam-gcp"},
+{"login":"gericdong"},
+{"login":"priyapandeyb"},
+{"login":"erwinh85"},
+{"login":"CadillacBurgess1"},
+{"login":"julieqiu"},
+{"login":"coryan"},
+{"login":"devoncarew"},
+{"login":"sai-sunder-s"},
+{"login":"harkamaljot"},
+{"login":"mrfaizal"}
 ]

.github/workflows/multi_approvers.yaml

@@ -28,4 +28,4 @@ jobs:
   multi-approvers:
     uses: 'abcxyz/pkg/.github/workflows/multi-approvers.yml@main'
     with:
-      org-members-path: '.github/workflows/members.json'
+      org-members-path: 'googleapis/google-auth-library-java/main/.github/workflows/members.json'

.github/workflows/sonar.yaml

@@ -38,9 +38,11 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
         mvn -B verify -Dcheckstyle.skip \
+            -Djacoco.skip=true \
             -DenableFullTestCoverage \
             -Dsonar.coverage.jacoco.xmlReportPaths=oauth2_http/target/site/jacoco/jacoco.xml \
             org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
             -Dsonar.projectKey=googleapis_google-auth-library-java \
             -Dsonar.organization=googleapis \
             -Dsonar.host.url=https://sonarcloud.io
+

.kokoro/build.sh

@@ -51,6 +51,11 @@ test)
     mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
     RETURN_CODE=$?
     ;;
+test-logging)
+    echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
+    mvn clean test -P '!slf4j2x,slf4j2x-test' -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
+    RETURN_CODE=$?
+    ;;
 lint)
     mvn com.coveo:fmt-maven-plugin:check -B -ntp
     RETURN_CODE=$?
@@ -66,6 +71,7 @@ integration)
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
       -Denforcer.skip=true \
+      -Djacoco.skip=true  \
       -fae \
       verify
     RETURN_CODE=$?
@@ -74,14 +80,14 @@ graalvmA)
     # Run Unit and Integration Tests with Native Image
     bash .kokoro/populate-secrets.sh
     export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test -Pslf4j2x test -pl 'oauth2_http'
     RETURN_CODE=$?
     ;;
 graalvmB)
     # Run Unit and Integration Tests with Native Image
     bash .kokoro/populate-secrets.sh
     export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test -Pslf4j2x test -pl 'oauth2_http'
     RETURN_CODE=$?
     ;;
 samples)

.kokoro/dependencies.sh

@@ -54,6 +54,7 @@ retry_with_backoff 3 10 \
   mvn install -B -V -ntp \
     -DskipTests=true \
     -Dmaven.javadoc.skip=true \
+    -Djacoco.skip=true \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true

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

@@ -44,6 +44,6 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.13.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.15.0"
 }
 

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

@@ -44,5 +44,5 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.13.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.15.0"
 }