From a29898136fc9b50213a13b5bebdddae8a1e950f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 16:08:55 +0000 Subject: [PATCH 1/2] chore(deps): update dependency java to v25 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c86e9fac11..e964df00f26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: - 11 - 17 - 21 - - 24 # renovate: datasource=java-version + - 25 # renovate: datasource=java-version # Collect coverage on latest LTS include: - os: ubuntu-latest @@ -50,7 +50,7 @@ jobs: - os: macos-13 test-java-version: 21 - os: macos-13 - test-java-version: 24 # renovate: datasource=java-version + test-java-version: 25 # renovate: datasource=java-version steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 @@ -168,7 +168,7 @@ jobs: matrix: test-graal-version: - 21 - - 24 # renovate: datasource=java-version + - 25 # renovate: datasource=java-version steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: graalvm/setup-graalvm@aba6a077d71fbfc02138d7470c4ad6e7f85bd2a9 # v1.3.7 From 39cfecfb3dbd71720f0cfd030984a64db51dbfda Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 26 Sep 2025 09:19:11 -0700 Subject: [PATCH 2/2] Fix --- .../opentelemetry/gradle/customchecks/OtelInternalJavadoc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-checks/src/main/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadoc.java b/custom-checks/src/main/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadoc.java index 0cc97d45abc..29d9b5921bc 100644 --- a/custom-checks/src/main/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadoc.java +++ b/custom-checks/src/main/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadoc.java @@ -76,6 +76,6 @@ private static String getJavadoc(VisitorState state) { if (docCommentTree == null) { return null; } - return docCommentTree.toString().replace("\n", ""); + return docCommentTree.toString().replace("\n", " ").replace(" * ", " ").replaceAll("\\s+", " "); } }