Merge branch 'main' into release-please--branches--main

Author: JoeWang1127

.github/workflows/ci.yaml

@@ -417,7 +417,7 @@ jobs:
       run: |
         mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
     - name: Validate gapic-generator-java-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@47ad868794c5d38ee7eb95d69371a7a79f84d890
+      uses: googleapis/java-cloud-bom/tests/validate-bom@ef3656d3c66f4c6bd3b2c569d64a77cb40aeb77e
       with:
         bom-path: gapic-generator-java-bom/pom.xml
 

.github/workflows/hermetic_library_generation.yaml

@@ -36,7 +36,7 @@ jobs:
       if: env.SHOULD_RUN == 'true'
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - name: Install Maven modules
       if: env.SHOULD_RUN == 'true'
       shell: bash
@@ -61,5 +61,5 @@ jobs:
         base_ref: ${{ github.base_ref }}
         head_ref: ${{ github.head_ref }}
         image_tag: ${{ env.GENERATOR_VERSION }}
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         showcase_mode: true

.github/workflows/nightly.yaml

@@ -62,7 +62,7 @@ jobs:
       - name: Create issue if previous step fails
         if: ${{ failure() }}
         env:
-          GITHUB_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         run: |
           gh issue create \
             --title "Nightly-java8 build on ${{ matrix.os }} failed." \

.github/workflows/update_googleapis_commit.yaml

@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - name: Update googleapis commit to latest
       shell: bash
       run: |
@@ -40,4 +40,4 @@ jobs:
           --base_branch "${base_branch}"\
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}

dependencies.txt

@@ -32,7 +32,7 @@ com.google.api-client:google-api-client,google.api-client=2.8.1
 org.threeten:threeten-extra,threeten-extra=1.8.0
 io.opencensus:opencensus-api,opencensus=0.31.1
 com.google.code.findbugs:jsr305,findbugs=3.0.2
-com.fasterxml.jackson:jackson-bom,jackson=2.20.1
+com.fasterxml.jackson:jackson-bom,jackson=2.21.0
 commons-codec:commons-codec,codec=1.20.0
 org.apache.httpcomponents:httpclient,httpcomponents.httpclient=4.5.14
 org.apache.httpcomponents:httpcore,httpcomponents.httpcore=4.4.16

generation_config.yaml

@@ -1,4 +1,4 @@
-googleapis_commitish: 6145b5ffe99d290c3d840136f310490d732acb04
+googleapis_commitish: d9f058d281e9ad5daf805d8e5405b9df89ce06ad
 # the libraries are ordered with respect to library name, which is
 # java-{library.library_name} or java-{library.api-shortname} when
 # library.library_name is not defined.

hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/update_generation_config.yaml

@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - name: Install Dependencies
       shell: bash
       run: sudo apt-get update && sudo apt-get install -y libxml2-utils
@@ -43,5 +43,5 @@ jobs:
           --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
 {% endraw %}