From e99c67de87bc9fe470e2659233e47040a497d18f Mon Sep 17 00:00:00 2001 From: Ruffian Jiang Date: Tue, 25 Aug 2026 13:24:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=92=89=E5=9B=9E=20htmlunit=20?= =?UTF-8?q?=E8=87=B3=204.21.0=EF=BC=88Java=2011=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E6=8C=A1=20major=20=E8=AF=AF=E5=8D=87=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - html2md/pom.xml: org.htmlunit:htmlunit 5.4.0 -> 4.21.0（5.x 要求 Java 17，项目以 Java 11 编译导致 master CI 失败：bad class file wrong version 61.0 should be 55.0） - .github/dependabot.yml: 新增 ignore 挡 org.htmlunit:htmlunit 的 semver-major，与 spring-boot* 规则并列，防止再次误升 Java 17 依赖 --- .github/dependabot.yml | 36 +++++++++++++++++++----------------- html2md/pom.xml | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6e63aaf..bf88217 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,17 +1,19 @@ -# java4fun → 放到 .github/dependabot.yml -version: 2 -updates: - - package-ecosystem: "maven" - directory: "/html2md" # 现有 PR 路径确认（Bump ... in /html2md） - schedule: - interval: "weekly" - groups: - all-dependencies: - patterns: ["*"] - open-pull-requests-limit: 10 - # 挡住 Spring Boot 的 major 自动升级：2.7.x → 4.x 属破坏性变更 - # （starter-aop 在 4.x 被重命名为 starter-aspectj，且需 Java 17 + Jakarta 命名空间） - # 仅允许 minor/patch 范围内的安全更新 - ignore: - - dependency-name: "org.springframework.boot:spring-boot*" - update-types: ["version-update:semver-major"] +# java4fun → 放到 .github/dependabot.yml +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/html2md" # 现有 PR 路径确认（Bump ... in /html2md） + schedule: + interval: "weekly" + groups: + all-dependencies: + patterns: ["*"] + open-pull-requests-limit: 10 + # 挡住 Spring Boot 的 major 自动升级：2.7.x → 4.x 属破坏性变更 + # （starter-aop 在 4.x 被重命名为 starter-aspectj，且需 Java 17 + Jakarta 命名空间） + # 仅允许 minor/patch 范围内的安全更新 + ignore: + - dependency-name: "org.springframework.boot:spring-boot*" + update-types: ["version-update:semver-major"] + - dependency-name: "org.htmlunit:htmlunit" + update-types: ["version-update:semver-major"] diff --git a/html2md/pom.xml b/html2md/pom.xml index a652487..1aeb216 100644 --- a/html2md/pom.xml +++ b/html2md/pom.xml @@ -41,7 +41,7 @@ org.htmlunit htmlunit - 5.4.0 + 4.21.0 From 395c2c0876d82a6b97825a8a59f21a27b75c6ba9 Mon Sep 17 00:00:00 2001 From: Ruffian Jiang Date: Tue, 25 Aug 2026 13:45:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=92=89=E5=9B=9E=20json-path=20?= =?UTF-8?q?=E8=87=B3=202.10.0=EF=BC=88Java=208=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E6=8C=A1=20major=20=E8=AF=AF=E5=8D=87=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit java4fun 以 Java 11 编译，com.jayway.jsonpath:json-path 3.0.0 要求 Java 17（class 61.0），导致 PR #16 的 Java CI 编译失败：bad class file wrong version 61.0 should be 55.0。 本 commit 在 htmlunit 5.4.0→4.21.0 基础上追加 json-path 3.0.0→2.10.0（最新 2.x，Java 8 兼容，含安全更新）；dependabot.yml ignore 再增加 com.jayway.jsonpath:json-path 的 semver-major，与 spring-boot*/htmlunit 并列。 --- .github/dependabot.yml | 2 ++ html2md/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bf88217..9fdf6ef 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,3 +17,5 @@ updates: update-types: ["version-update:semver-major"] - dependency-name: "org.htmlunit:htmlunit" update-types: ["version-update:semver-major"] + - dependency-name: "com.jayway.jsonpath:json-path" + update-types: ["version-update:semver-major"] diff --git a/html2md/pom.xml b/html2md/pom.xml index 1aeb216..f8ef205 100644 --- a/html2md/pom.xml +++ b/html2md/pom.xml @@ -71,7 +71,7 @@ com.jayway.jsonpath json-path - 3.0.0 + 2.10.0