8000 chore: Update generation configuration at Thu Apr 24 02:28:57 UTC 202… · googleapis/java-logging@7cce5b5 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7cce5b5

Browse files
chore: Update generation configuration at Thu Apr 24 02:28:57 UTC 2025 (#1790)
* chore: Update generation configuration at Wed Apr 23 17:13:26 UTC 2025 * chore: generate libraries at Wed Apr 23 17:14:00 UTC 2025 * chore: Update generation configuration at Thu Apr 24 02:28:57 UTC 2025 * chore: manually update generation configuration * chore: generate libraries at Thu Apr 24 14:52:36 UTC 2025 * chore: update libraries bom version to the latest * chore: generate libraries at Thu Apr 24 14:58:18 UTC 2025 * chore: remove old kokoro jobs --------- Co-authored-by: Diego Marquez <diegomarquezp@google.com>
1 parent 0b96d0c commit 7cce5b5

File tree

189 files changed

+4011
-602
lines changed
  • Some content is hidden

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

    189 files changed

    +4011
    -602
    lines changed

    .github/generated-files-bot.yml

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,6 +6,7 @@ externalManifests:
    66
    file: '.github/readme/synth.metadata/synth.metadata'
    77
    jsonpath: '$.generatedFiles[*]'
    88
    ignoreAuthors:
    9+
    - 'cloud-java-bot'
    910
    - 'renovate-bot'
    1011
    - 'yoshi-automation'
    1112
    - 'release-please[bot]'

    .github/scripts/update_generation_config.sh

    Lines changed: 9 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,8 +15,15 @@ set -e
    1515
    function get_latest_released_version() {
    1616
    local group_id=$1
    1717
    local artifact_id=$2
    18-
    latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
    19-
    echo "${latest}"
    18+
    json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
    19+
    latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
    20+
    if [[ -z "${latest}" ]]; then
    21+
    echo "The latest version of ${group_id}:${artifact_id} is empty."
    22+
    echo "The returned json from maven.org is invalid: ${json_content}"
    23+
    exit 1
    24+
    else
    25+
    echo "${latest}"
    26+
    fi
    2027
    }
    2128

    2229
    # Update a key to a new value in the generation config.

    .github/sync-repo-settings.yaml

    Lines changed: 3 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,8 +15,9 @@ branchProtectionRules:
    1515
    - units (11)
    1616
    - 'Kokoro - Test: Integration'
    1717
    - cla/google
    18-
    - 'Kokoro - Test: Java GraalVM Native Image'
    19-
    - 'Kokoro - Test: Java 17 GraalVM Native Image'
    18+
    - 'Kokoro - Test: Java GraalVM Native Image A'
    19+
    - 'Kokoro - Test: Java GraalVM Native Image B'
    20+
    - 'Kokoro - Test: Java GraalVM Native Image C'
    2021
    - javadoc
    2122
    - library_generation
    2223
    - unmanaged_dependency_check

    .github/workflows/ci.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -104,7 +104,7 @@ jobs:
    104104
    - uses: actions/setup-java@v4
    105105
    with:
    106106
    distribution: temurin
    107-
    java-version: 11
    107+
    java-version: 17
    108108
    - run: java -version
    109109
    - run: .kokoro/build.sh
    110110
    env:

    .github/workflows/hermetic_library_generation.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -37,7 +37,7 @@ jobs:
    3737
    with:
    3838
    fetch-depth: 0
    3939
    token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
    40-
    - uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
    40+
    - uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2
    4141
    if: env.SHOULD_RUN == 'true'
    4242
    with:
    4343
    base_ref: ${{ github.base_ref }}

    .github/workflows/renovate_config_check.yaml

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@ on:
    77

    88
    jobs:
    99
    renovate_bot_config_validation:
    10-
    runs-on: ubuntu-22.04
    10+
    runs-on: ubuntu-24.04
    1111

    1212
    steps:
    1313
    - name: Checkout code
    @@ -16,7 +16,7 @@ jobs:
    1616
    - name: Set up Node.js
    1717
    uses: actions/setup-node@v4
    1818
    with:
    19-
    node-version: '20'
    19+
    node-version: '22'
    2020

    2121
    - name: Install Renovate and Config Validator
    2222
    run: |

    .github/workflows/samples.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -24,7 +24,7 @@ jobs:
    2424
    - uses: actions/setup-java@v4
    2525
    with:
    2626
    distribution: temurin
    27-
    java-version: 8
    27+
    java-version: 17
    2828
    - name: Run checkstyle
    2929
    run: mvn -P lint --quiet --batch-mode checkstyle:check
    3030
    working-directory: samples/snippets

    .github/workflows/update_generation_config.yaml

    Lines changed: 4 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -21,13 +21,14 @@ on:
    2121

    2222
    jobs:
    2323
    update-generation-config:
    24-
    runs-on: ubuntu-22.04
    24+
    runs-on: ubuntu-24.04
    2525
    env:
    2626
    # the branch into which the pull request is merged
    2727
    base_branch: main
    2828
    steps:
    2929
    - uses: actions/checkout@v4
    3030
    with:
    31+
    fetch-depth: 0
    3132
    token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
    3233
    - name: Update params in generation config to latest
    3334
    shell: bash
    @@ -36,7 +37,8 @@ jobs:
    3637
    [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
    3738
    [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
    3839
    bash .github/scripts/update_generation_config.sh \
    39-
    --base_branch "${base_branch}"\
    40+
    --base_branch "${base_branch}" \
    4041
    --repo ${{ github.repository }}
    4142
    env:
    4243
    GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
    44+

    .kokoro/build.sh

    Lines changed: 12 additions & 12 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,11 +1,11 @@
    11
    #!/bin/bash
    2-
    # Copyright 2019 Google LLC
    2+
    # Copyright 2025 Google LLC
    33
    #
    44
    # Licensed under the Apache License, Version 2.0 (the "License");
    55
    # you may not use this file except in compliance with the License.
    66
    # You may obtain a copy of the License at
    77
    #
    8-
    # http://www.apache.org/licenses/LICENSE-2.0
    8+
    # https://www.apache.org/licenses/LICENSE-2.0
    99
    #
    1010
    # Unless required by applicable law or agreed to in writing, software
    1111
    # distributed under the License is distributed on an "AS IS" BASIS,
    @@ -42,21 +42,22 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
    4242
    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
    4343
    fi
    4444

    45+
    4546
    RETURN_CODE=0
    4647
    set +e
    4748

    4849
    case ${JOB_TYPE} in
    4950
    test)
    5051
    echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
    51-
    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
    52+
    mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
    5253
    RETURN_CODE=$?
    5354
    ;;
    5455
    lint)
    55-
    mvn com.coveo:fmt-maven-plugin:check -B -ntp
    56+
    mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
    5657
    RETURN_CODE=$?
    5758
    ;;
    5859
    javadoc)
    59-
    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
    60+
    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
    6061
    RETURN_CODE=$?
    6162
    ;;
    6263
    integration)
    @@ -66,18 +67,16 @@ integration)
    6667
    -DtrimStackTrace=false \
    6768
    -Dclirr.skip=true \
    6869
    -Denforcer.skip=true \
    70+
    -Dcheckstyle.skip=true \
    71+
    -DskipUnitTests=true \
    72+
    -Dfmt.skip=true \
    6973
    -fae \
    7074
    verify
    7175
    RETURN_CODE=$?
    7276
    ;;
    7377
    graalvm)
    7478
    # Run Unit and Integration Tests with Native Image
    75-
    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
    76-
    RETURN_CODE=$?
    77-
    ;;
    78-
    graalvm17)
    79-
    # Run Unit and Integration Tests with Native Image
    80-
    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
    79+
    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
    8180
    RETURN_CODE=$?
    8281
    ;;
    8382
    samples)
    @@ -101,6 +100,7 @@ samples)
    101100
    -DtrimStackTrace=false \
    102101
    -Dclirr.skip=true \
    103102
    -Denforcer.skip=true \
    103+
    -Dfmt.skip=true \
    104104
    -fae \
    105105
    verify
    106106
    RETURN_CODE=$?
    @@ -110,7 +110,7 @@ samples)
    110110
    fi
    111111
    ;;
    112112
    clirr)
    113-
    mvn -B -ntp -Denforcer.skip=true clirr:check
    113+
    mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
    114114
    RETURN_CODE=$?
    115115
    ;;
    116116
    *)
    Lines changed: 6 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -3,7 +3,7 @@
    33
    # Configure the docker image for kokoro-trampoline.
    44
    env_vars: {
    55
    key: "TRAMPOLINE_IMAGE"
    6-
    value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
    6+
    value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
    77
    }
    88

    99
    env_vars: {
    @@ -31,3 +31,8 @@ env_vars: {
    3131
    key: "SECRET_MANAGER_KEYS"
    3232
    value: "java-it-service-account"
    3333
    }
    34+
    35+
    env_vars: {
    36+
    key: "IT_SERVICE_ACCOUNT_EMAIL"
    37+
    value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
    38+
    }

    0 commit comments

    Comments
     (0)
    0