From b0e20eaf6b811e7c9425b22498e1dadc06618e31 Mon Sep 17 00:00:00 2001 From: Brendan Burns <5751682+brendandburns@users.noreply.github.com> Date: Fri, 19 Jun 2026 03:26:14 +0000 Subject: [PATCH 1/2] build(deps): roll up open dependabot updates on master Includes open Dependabot updates targeting master for actions/checkout, graalvm/setup-graalvm, aws.sdk.version, junit-jupiter.version, junit-platform.version, and okio.version, with lockfile sync and workflow conflict resolution. --- .github/workflows/bazel.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .../dependabot-sync-bazel-backfill.yml | 2 +- .github/workflows/dependabot-sync-bazel.yml | 2 +- .github/workflows/generate-crd.yml | 2 +- .github/workflows/generate.yml | 4 +- .github/workflows/maven.yml | 14 +-- .github/workflows/release.yml | 2 +- .github/workflows/snapshot.yml | 2 +- .github/workflows/spring.yml | 2 +- MODULE.bazel | 12 +- maven_install.json | 112 +++++++++--------- pom.xml | 2 +- 13 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 57a10981bd..91ffef225c 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -52,7 +52,7 @@ jobs: MSYS2_ARG_CONV_EXCL: "*" steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Set up Java ${{ matrix.java }} uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5c83dd4808..c7e41ba68c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Java uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 with: diff --git a/.github/workflows/dependabot-sync-bazel-backfill.yml b/.github/workflows/dependabot-sync-bazel-backfill.yml index 501ff33c4d..73f210a4f1 100644 --- a/.github/workflows/dependabot-sync-bazel-backfill.yml +++ b/.github/workflows/dependabot-sync-bazel-backfill.yml @@ -22,7 +22,7 @@ jobs: BAZELISK_SKIP_VERSION_CHECK: "1" steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Set up Java 17 uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 diff --git a/.github/workflows/dependabot-sync-bazel.yml b/.github/workflows/dependabot-sync-bazel.yml index ca9e6172c9..e965df2d70 100644 --- a/.github/workflows/dependabot-sync-bazel.yml +++ b/.github/workflows/dependabot-sync-bazel.yml @@ -20,7 +20,7 @@ jobs: BAZELISK_SKIP_VERSION_CHECK: "1" steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/generate-crd.yml b/.github/workflows/generate-crd.yml index ebb1863cef..a8f7e21f20 100644 --- a/.github/workflows/generate-crd.yml +++ b/.github/workflows/generate-crd.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Run CRD Model Generation run: | read CRD_SRC_ARGS < <(echo '${{ github.event.inputs.crds }}' | perl -ne 'print join " ", map {"-u $_"} split /,/') diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 054ff39c92..9f90bc5feb 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Java - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: token: ${{ secrets.PAT_TOKEN }} - name: Setup Java @@ -45,7 +45,7 @@ jobs: java-version: 17.0.x cache: maven - name: Checkout Gen - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: path: gen repository: kubernetes-client/gen diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 69d0e36076..10026b4d5c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest name: Verify Source Format steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Java uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 with: @@ -27,7 +27,7 @@ jobs: os: [ macos-latest, windows-latest, ubuntu-latest ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Java uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 with: @@ -54,8 +54,8 @@ jobs: runs-on: ubuntu-latest name: GraalVM Maven Test steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: graalvm/setup-graalvm@809afe62741147990fbf405045cd15e61bffedfe # v1.5.5 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: graalvm/setup-graalvm@6f3fa030c4b8f77c1f554a860f593a654538fa38 # v1.5.6 with: version: '22.3.0' java-version: '17' @@ -66,7 +66,7 @@ jobs: runs-on: ubuntu-latest name: End-to-End Test Against Real Cluster steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Create k8s Kind Cluster uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0 - name: Setup Java @@ -91,7 +91,7 @@ jobs: runs-on: ubuntu-latest name: Examples smoke test steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Java uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 with: @@ -141,7 +141,7 @@ jobs: - 5000:5000 name: CRD Java Models Code Generation steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Publish to Registry uses: elgohr/Publish-Docker-Github-Action@1c2f28ccd9476e8a936ac9a1f287405504c93304 # v5 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24b6ad9759..1fb509a6b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: echo "${{ github.event.inputs.releaseVersion }}" | perl -ne 'die unless m/^\d+\.\d+\.\d+$/' echo "${{ github.event.inputs.nextDevelopmentVersion }}" | perl -ne 'die unless m/^\d+\.\d+\.\d+-SNAPSHOT$/' - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: token: ${{ secrets.PAT_TOKEN }} - name: Check Actor diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index ec7c00cbbe..027fb4a78c 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Java uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 with: diff --git a/.github/workflows/spring.yml b/.github/workflows/spring.yml index b866c03f13..245ab62ee6 100644 --- a/.github/workflows/spring.yml +++ b/.github/workflows/spring.yml @@ -14,7 +14,7 @@ jobs: env: BAZELISK_SKIP_VERSION_CHECK: "1" steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Java uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 with: diff --git a/MODULE.bazel b/MODULE.bazel index 7b0bfa2947..70fb45486e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -42,12 +42,12 @@ maven.install( "org.slf4j:slf4j-api:2.0.18", "org.bouncycastle:bcpkix-jdk18on:1.84", "org.bouncycastle:bcprov-jdk18on:1.84", - "software.amazon.awssdk:sts:2.46.5", - "software.amazon.awssdk:auth:2.46.5", - "software.amazon.awssdk:http-auth-aws:2.46.5", - "software.amazon.awssdk:http-auth-spi:2.46.5", - "software.amazon.awssdk:http-client-spi:2.46.5", - "software.amazon.awssdk:utils:2.46.5", + "software.amazon.awssdk:sts:2.46.13", + "software.amazon.awssdk:auth:2.46.13", + "software.amazon.awssdk:http-auth-aws:2.46.13", + "software.amazon.awssdk:http-auth-spi:2.46.13", + "software.amazon.awssdk:http-client-spi:2.46.13", + "software.amazon.awssdk:utils:2.46.13", "com.google.protobuf:protobuf-java:4.35.0", "org.bitbucket.b_c:jose4j:0.9.6", "com.bucket4j:bucket4j-core:8.10.1", diff --git a/maven_install.json b/maven_install.json index af7320906d..dcd5397dd1 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -604013199, - "__RESOLVED_ARTIFACTS_HASH": -1192023294, + "__INPUT_ARTIFACTS_HASH": -1383009097, + "__RESOLVED_ARTIFACTS_HASH": -319516904, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.14.0", "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.48.0", @@ -894,165 +894,165 @@ }, "software.amazon.awssdk:annotations": { "shasums": { - "jar": "11caa18f6697cf6b4d99c69d683cd634855ff699a3fedf615ad11e5f036f6f36" + "jar": "a5ff717d988ae15e3bc1d7c240ccfbf01b71f5cdd5cfc84258e4c60f2472456b" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:apache5-client": { "shasums": { - "jar": "02d974b72e8180ef0733d24e1350979a84991bcc531884078778bbdf829044f9" + "jar": "34722d70c31dbaa12859b86044173467c16f6672bcf2d84f1af4b9980c8e34ec" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:auth": { "shasums": { - "jar": "84458bd35f69f46da4728489b8e3d3aca1e6c12d7a033b22aee1f9f0eaf40015" + "jar": "04ecd3a855e992debb30215f3970932b7d58d05e9aac6bf9d7dda9953807a065" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:aws-core": { "shasums": { - "jar": "5b7466554d4f5d1d475da1c277104b6f2e3c021a3ecdd4ec68519840f7bf9077" + "jar": "d881f0c986dc7ec646347e0e6e09d610c0a78d48c0fe83e79b67360707a2ff5f" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:aws-query-protocol": { "shasums": { - "jar": "33a1735336bf0f4538a9ee30d4b5fc41ad2d1a89d23848ff5cfa4fce35d87978" + "jar": "e122efa14a0535c22f8daf70599ecc3045f802643cff2819c65fdcacf7780918" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:checksums": { "shasums": { - "jar": "f7916521b86190750ddc8a26aa9c4c6c889363027fdc3f985f7fd328a5cf7278" + "jar": "b444672d69ac3d3ebb9c4b03eb397264b3a2f2b03ab47c74da140c0ebe6d5493" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:checksums-spi": { "shasums": { - "jar": "3212f25f7eff4b96c6b35c41a840b74f19c13589f31e8595b8bf4f40c2e791a6" + "jar": "0cc65f3f5905ca8e92f3c768e435a9199a9abec70b550a440405d54a3204fe8b" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:endpoints-spi": { "shasums": { - "jar": "ab63932425fc1afad3c0f08081a470a086156044218998fdc42253cb68e48a29" + "jar": "7d419360f173d7b78758f8252393f958530839b07f869b96ec9616363eb4f1e8" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:http-auth": { "shasums": { - "jar": "e9d1c284a74765afe60d30ce7c0a0ed70b22358f29217cdc7d8df5b0546e2b9e" + "jar": "2a35c11afea2cf0eefc382c40b3d12594ebbd8e3a48d71fdb5203bb9c0818040" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:http-auth-aws": { "shasums": { - "jar": "e2beed0e1af5467a3b12b083888c12ba2b755a758ae9780e543acf319155be67" + "jar": "1dcd826c41ffe0afb38b1933dac9973e02f221c5bce34f96b593a7e157640587" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:http-auth-aws-eventstream": { "shasums": { - "jar": "b998e4d95b8e62c19bb2129f450109b3738d2541cc7bcbc80283652f2661f5b4" + "jar": "5be343a08a30bf30b9a34eeb71ca229ace17e3ae984013ef7bc43fc8e28997f8" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:http-auth-spi": { "shasums": { - "jar": "d16770c6992eccbeb6981b86b5d80edf1b92b17ca9fe5c62086771f6f478c3df" + "jar": "e69df875bb5ce3f306c7e54ec712644c6caf3101d642de68e095681cc3cec25f" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:http-client-spi": { "shasums": { - "jar": "cf133aac508e67d1a9c824979bfdc53d125fd7f817e0944bc61034fe7ab26c85" + "jar": "848e57732e9f9d83ec25879154485ffeece4a9900d91e0989664d1d69810fac4" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:identity-spi": { "shasums": { - "jar": "8f7137c582542666152b44c27f7814d47c6320542e8493ea37f60c0ff195488a" + "jar": "2b3392752f2bd2cb3c2b9874de57262ed65377c665814e13a93d3d6a3069a01b" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:json-utils": { "shasums": { - "jar": "9b65602833f01c2a78004a2bc3f54d6b5e8dbb4a00ffe6b972c0dfc7d72b6cc8" + "jar": "338941ab2f27acae92ceeffe8b3fd9efae0c28afe58f59f89dd0a0cab4dd9974" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:metrics-spi": { "shasums": { - "jar": "46789ad4580475e8df614a8addf25447840d0bd12854240dff56771b0578946e" + "jar": "6db48f689e5ddd1b6bad9b6a58abc79b892a5aff5a312a0c3ba8632a222b1681" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:netty-nio-client": { "shasums": { - "jar": "b1844a80187c9ad68e2f17d1941918f07f07108c1dc411391ded83a1a05a8239" + "jar": "5f8c0c85dbbdb86ba20f61cdffd0099879498acda8fff3d5684b2f1547fa2d6c" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:profiles": { "shasums": { - "jar": "e4db6a7a583ece71e5ddc4d9449e602ed21e981f3b4869450511086f752eb58d" + "jar": "f12192189af377092f4a0c9fa663ef2c9b0c5066a06e45373ca7fd92b6904319" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:protocol-core": { "shasums": { - "jar": "829f3912abf95f15691753ae993a1311aa7b589728d0b7ffe90c6fe03fe5e059" + "jar": "3fb8fd7da6f123fffca4d180237c14b2edd4dd4fb763cfc3810f368a3d495ac2" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:regions": { "shasums": { - "jar": "87a06590f32608dc838c930c42d95426965a58aeb0afaf82a6fc88b95d9696cf" + "jar": "84f31cb7b97e510b620a1da13e42a4cad9d20af5e462e050844c78a165396104" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:retries": { "shasums": { - "jar": "2e426dcdbf3d9525211ace276f9785d5dbf6bfa2cf86532da33cf647a49094ac" + "jar": "5274fe8fd0849379556876b7e2b1c31fa5308591474a19f70e75f6b3448ac92a" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:retries-spi": { "shasums": { - "jar": "48dcb99b1b7e46f26ebac1cdb355b70db955bca821233fc1539c694097e53bab" + "jar": "4b26e52782df808fe37a8091a41219913ea7c811459b64acb1c36e1c0a2444d8" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:sdk-core": { "shasums": { - "jar": "a454f90ba664e5ffc439f96714766ff3a7fb69521cba3e7b9cc39a9640e64db8" + "jar": "2d055fb46404bc97ce6fba1b2884fb20e0a2971115f97224530a966ece00b9a4" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:sts": { "shasums": { - "jar": "c80cb3249aea7cc72274a0a87d3fd5fb5bf2eeab8282342417ae2765ed3cc17f" + "jar": "5032a277962940f7ce7277a8e1e55db2a0089ff7dafc958ee753429cd58c75eb" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:third-party-jackson-core": { "shasums": { - "jar": "556a08477da9a7e7106898379d66e13beee27933240a490ca4500f18e38edaed" + "jar": "f7eba8fdb53c2dc547db56b3a607d1455434ebeb43adb453568bd99ea3e033ab" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:utils": { "shasums": { - "jar": "89bdb37d6cc4d30195e3b9db73fafb60fc71e58cafee73abf54c31c0903b262e" + "jar": "24d7afecfc3259a31b73782cc3a4f05c0b58a320d1f9203cfed5d3d9d2ab5678" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.awssdk:utils-lite": { "shasums": { - "jar": "9be889feee84619a581ec0ef901b87bf4c0765f458903cd7f6b776751b103746" + "jar": "830f945961b262c988d6f2439b277304b897798bb582e2e7b5a78b8e784a1c6a" }, - "version": "2.46.5" + "version": "2.46.13" }, "software.amazon.eventstream:eventstream": { "shasums": { diff --git a/pom.xml b/pom.xml index 4325228c51..f80354e6fe 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 7.0.8 0.16.0 0.10.2 - 2.46.5 + 2.46.13 1.47.0 0.9.6 26.1.0 From 8b135b79086f5721859e3e6376df75734a2eda1c Mon Sep 17 00:00:00 2001 From: Brendan Burns <5751682+brendandburns@users.noreply.github.com> Date: Fri, 19 Jun 2026 16:06:00 +0000 Subject: [PATCH 2/2] build(deps): bump okio.version, junit-jupiter.version, and junit-platform.version - Bump okio.version from 3.16.4 to 3.17.0 - Bump junit-jupiter.version from 5.13.4 to 6.1.0 - Bump junit-platform.version from 1.13.4 to 6.1.0 Sync Bazel dependencies for Dependabot updates --- MODULE.bazel | 18 ++--- .../client/examples/WebSocketsExample.java | 2 +- .../examples/YamlCreateResourceExample.java | 2 +- maven_install.json | 80 +++++++++---------- pom.xml | 6 +- 5 files changed, 53 insertions(+), 55 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 70fb45486e..8f1da2890a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -66,8 +66,8 @@ maven.install( "org.jetbrains:annotations:26.1.0", "org.reflections:reflections:0.10.2", "com.squareup.okhttp3:okhttp-jvm:5.3.2", - "com.squareup.okio:okio:3.16.4", - "com.squareup.okio:okio-jvm:3.16.4", + "com.squareup.okio:okio:3.17.0", + "com.squareup.okio:okio-jvm:3.17.0", "com.flipkart.zjsonpatch:zjsonpatch:0.4.16", # ---- spring (Java 17+ modules) ---- "org.springframework:spring-core:7.0.8", @@ -79,13 +79,13 @@ maven.install( # ---- test ---- "ch.qos.logback:logback-classic:1.5.32", "ch.qos.logback:logback-core:1.5.32", - "org.junit.jupiter:junit-jupiter-api:5.13.4", - "org.junit.jupiter:junit-jupiter-engine:5.13.4", - "org.junit.jupiter:junit-jupiter-params:5.13.4", - "org.junit.platform:junit-platform-launcher:1.13.4", - "org.junit.platform:junit-platform-commons:1.13.4", - "org.junit.platform:junit-platform-engine:1.13.4", - "org.junit.platform:junit-platform-reporting:1.13.4", + "org.junit.jupiter:junit-jupiter-api:6.1.0", + "org.junit.jupiter:junit-jupiter-engine:6.1.0", + "org.junit.jupiter:junit-jupiter-params:6.1.0", + "org.junit.platform:junit-platform-launcher:6.1.0", + "org.junit.platform:junit-platform-commons:6.1.0", + "org.junit.platform:junit-platform-engine:6.1.0", + "org.junit.platform:junit-platform-reporting:6.1.0", "org.mockito:mockito-core:5.23.0", "org.mockito:mockito-junit-jupiter:5.23.0", "uk.org.webcompere:system-stubs-jupiter:2.1.8", diff --git a/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/WebSocketsExample.java b/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/WebSocketsExample.java index e1f54dcd07..55c4834220 100644 --- a/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/WebSocketsExample.java +++ b/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/WebSocketsExample.java @@ -27,7 +27,7 @@ * *

If you do need to run it, you can run: mvn exec:java \ * -Dexec.mainClass=io.kubernetes.client.examples.WebSocketsExample \ - * -Dexec.args=/api/v1/namespaces/default/pods//attach?stdout=true + * -Dexec.args={@code /api/v1/namespaces/default/pods//attach?stdout=true} * *

Note that you'd think 'watch' calls were WebSockets, but you'd be wrong, they're straight HTTP * GET calls. diff --git a/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/YamlCreateResourceExample.java b/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/YamlCreateResourceExample.java index c00d7fc7c1..e4e8c23017 100644 --- a/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/YamlCreateResourceExample.java +++ b/examples/examples-release-latest/src/main/java/io/kubernetes/client/examples/YamlCreateResourceExample.java @@ -25,7 +25,7 @@ /** * A simple example of how to use Yaml.createResource() to create Kubernetes resources from YAML - * without specifying the type upfront. This is equivalent to `kubectl create -f `. + * without specifying the type upfront. This is equivalent to {@code kubectl create -f }. * *

Easiest way to run this: mvn exec:java * -Dexec.mainClass="io.kubernetes.client.examples.YamlCreateResourceExample" diff --git a/maven_install.json b/maven_install.json index dcd5397dd1..84d7e24213 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1383009097, - "__RESOLVED_ARTIFACTS_HASH": -319516904, + "__INPUT_ARTIFACTS_HASH": 1212027181, + "__RESOLVED_ARTIFACTS_HASH": -991636594, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.14.0", "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.48.0", @@ -216,15 +216,15 @@ }, "com.squareup.okio:okio": { "shasums": { - "jar": "c9964f394c4cd32b79bf338afbfa2f2297221eee08311787061cea55f87dd60e" + "jar": "892898ff13b0cfda5f0bf689eb33b7c00c853b2531fcd4fe20fe5302d37981d8" }, - "version": "3.16.4" + "version": "3.17.0" }, "com.squareup.okio:okio-jvm": { "shasums": { - "jar": "2196b993cd34dbbd919e7e01f57a4781b58bee80f86106163e287c20343a96a7" + "jar": "3b13dcc3e1573047c2d507fc4f7fcb0bb0cbcd9d395da21d20e09406e2cd6a73" }, - "version": "3.16.4" + "version": "3.17.0" }, "commons-codec:commons-codec": { "shasums": { @@ -708,45 +708,45 @@ }, "org.junit.jupiter:junit-jupiter-api": { "shasums": { - "jar": "d1bb81abfd9e03418306b4e6a3390c8db52c58372e749c2980ac29f0c08278f1" + "jar": "50f97eb800c2e888faa237a06f5a0ef445faed5567f994dac0c2b9d278a9ad20" }, - "version": "5.13.4" + "version": "6.1.0" }, "org.junit.jupiter:junit-jupiter-engine": { "shasums": { - "jar": "027404a92fe618b72465792a257951495c503a7d5751e2791e0f51c87f67f5bc" + "jar": "ea707b9647084619a0fc911cefb25037540d58b2800f8ead1fc6a2baf58b1da5" }, - "version": "5.13.4" + "version": "6.1.0" }, "org.junit.jupiter:junit-jupiter-params": { "shasums": { - "jar": "3a8c6365716dbb698c0d49a05456c1e1ad05c406613c550f9dd50037872efc41" + "jar": "b987eea3205185a76f3659a39e67503cb7b682d8b7be03be4b9f92b710f0eec0" }, - "version": "5.13.4" + "version": "6.1.0" }, "org.junit.platform:junit-platform-commons": { "shasums": { - "jar": "1c25ca641ebaae44ff3ad21ca1b2ef68d0dd84bfeb07c4805ba7840899b77408" + "jar": "1d9046ab17ec7edafb0bc7945d2e59d7180fff4f28c734b823b51001e769f71b" }, - "version": "1.13.4" + "version": "6.1.0" }, "org.junit.platform:junit-platform-engine": { "shasums": { - "jar": "390c5f77b84283a64b644f88251b397e0b0debb80bdcc50f899881aecff43a5a" + "jar": "3fb6be76c26ab0f94fe084e3fd0a39e1d25e22129929a61b29bd80a052b93ea5" }, - "version": "1.13.4" + "version": "6.1.0" }, "org.junit.platform:junit-platform-launcher": { "shasums": { - "jar": "0b0beaeb6880a31149641d2d848b863712885469670c12099586d7f798522564" + "jar": "0995e6ed244d66196cbda019e2f879504d0b48971edae9cc3dea46a1b31c0377" }, - "version": "1.13.4" + "version": "6.1.0" }, "org.junit.platform:junit-platform-reporting": { "shasums": { - "jar": "7ebeb4ad2d39a61507623e4c6185651c2bcf560dd378f13229ed2492847c21f6" + "jar": "6bceb2bb75a5b32774beaa7c520201b863463cf922f2f2b0b6492a850af06a8b" }, - "version": "1.13.4" + "version": "6.1.0" }, "org.mockito:mockito-core": { "shasums": { @@ -768,9 +768,9 @@ }, "org.opentest4j.reporting:open-test-reporting-tooling-spi": { "shasums": { - "jar": "f0d54b46fb9e503b22abc65c45a48025aad16051903aaed11f6d974129f74252" + "jar": "df237b68847637747f0bfdb88fa9cdd9c72cc85550fad0c41ddb33869a5ca516" }, - "version": "0.2.3" + "version": "0.2.5" }, "org.opentest4j:opentest4j": { "shasums": { @@ -1420,32 +1420,39 @@ ], "org.junit.jupiter:junit-jupiter-api": [ "org.apiguardian:apiguardian-api", + "org.jspecify:jspecify", "org.junit.platform:junit-platform-commons", "org.opentest4j:opentest4j" ], "org.junit.jupiter:junit-jupiter-engine": [ "org.apiguardian:apiguardian-api", + "org.jspecify:jspecify", "org.junit.jupiter:junit-jupiter-api", "org.junit.platform:junit-platform-engine" ], "org.junit.jupiter:junit-jupiter-params": [ "org.apiguardian:apiguardian-api", + "org.jspecify:jspecify", "org.junit.jupiter:junit-jupiter-api" ], "org.junit.platform:junit-platform-commons": [ - "org.apiguardian:apiguardian-api" + "org.apiguardian:apiguardian-api", + "org.jspecify:jspecify" ], "org.junit.platform:junit-platform-engine": [ "org.apiguardian:apiguardian-api", + "org.jspecify:jspecify", "org.junit.platform:junit-platform-commons", "org.opentest4j:opentest4j" ], "org.junit.platform:junit-platform-launcher": [ "org.apiguardian:apiguardian-api", + "org.jspecify:jspecify", "org.junit.platform:junit-platform-engine" ], "org.junit.platform:junit-platform-reporting": [ "org.apiguardian:apiguardian-api", + "org.jspecify:jspecify", "org.junit.platform:junit-platform-launcher", "org.opentest4j.reporting:open-test-reporting-tooling-spi" ], @@ -3223,7 +3230,9 @@ "org.junit.jupiter.api.extension.support", "org.junit.jupiter.api.function", "org.junit.jupiter.api.io", - "org.junit.jupiter.api.parallel" + "org.junit.jupiter.api.parallel", + "org.junit.jupiter.api.timeout", + "org.junit.jupiter.api.util" ], "org.junit.jupiter:junit-jupiter-engine": [ "org.junit.jupiter.engine", @@ -3240,28 +3249,16 @@ "org.junit.jupiter.params.aggregator", "org.junit.jupiter.params.converter", "org.junit.jupiter.params.provider", - "org.junit.jupiter.params.shadow.com.univocity.parsers.annotations", - "org.junit.jupiter.params.shadow.com.univocity.parsers.annotations.helpers", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.beans", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.fields", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.input", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.input.concurrent", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.iterators", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.processor", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.processor.core", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.record", - "org.junit.jupiter.params.shadow.com.univocity.parsers.common.routine", - "org.junit.jupiter.params.shadow.com.univocity.parsers.conversions", - "org.junit.jupiter.params.shadow.com.univocity.parsers.csv", - "org.junit.jupiter.params.shadow.com.univocity.parsers.fixed", - "org.junit.jupiter.params.shadow.com.univocity.parsers.tsv", + "org.junit.jupiter.params.shadow.de.siegmar.fastcsv.reader", + "org.junit.jupiter.params.shadow.de.siegmar.fastcsv.util", + "org.junit.jupiter.params.shadow.de.siegmar.fastcsv.writer", "org.junit.jupiter.params.support" ], "org.junit.platform:junit-platform-commons": [ "org.junit.platform.commons", "org.junit.platform.commons.annotation", "org.junit.platform.commons.function", + "org.junit.platform.commons.io", "org.junit.platform.commons.logging", "org.junit.platform.commons.support", "org.junit.platform.commons.support.conversion", @@ -3275,19 +3272,20 @@ "org.junit.platform.engine.support.config", "org.junit.platform.engine.support.descriptor", "org.junit.platform.engine.support.discovery", - "org.junit.platform.engine.support.filter", "org.junit.platform.engine.support.hierarchical", "org.junit.platform.engine.support.store" ], "org.junit.platform:junit-platform-launcher": [ "org.junit.platform.launcher", "org.junit.platform.launcher.core", + "org.junit.platform.launcher.jfr", "org.junit.platform.launcher.listeners", "org.junit.platform.launcher.listeners.discovery", "org.junit.platform.launcher.listeners.session", "org.junit.platform.launcher.tagexpression" ], "org.junit.platform:junit-platform-reporting": [ + "org.junit.platform.reporting", "org.junit.platform.reporting.legacy", "org.junit.platform.reporting.legacy.xml", "org.junit.platform.reporting.open.xml", diff --git a/pom.xml b/pom.xml index f80354e6fe..7d452cc65a 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ 2.0.18 3.0.0 4.35.0 - 5.13.4 - 1.13.4 + 6.1.0 + 6.1.0 ${junit-jupiter.version} 8.10.1 1.84 @@ -79,7 +79,7 @@ 26.1.0 1.5.32 5.23.0 - 3.16.4 + 3.17.0 3.27.7 4.3.0 2.1.8