Skip to content

fix: upgrade security dependencies and align Maven 4 CI #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loong10k merged 1 commit into from
Nov 3, 2026
Merged

fix: upgrade security dependencies and align Maven 4 CI #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# CI workflow for the main line (JDK 17)
# CI workflow for the main line (JDK 21)
#
# Triggers:
# - push / pull_request on the main branch
# - manual workflow_dispatch
#
# Runs `mvn -B clean verify` which includes the JaCoCo coverage gate
# (90% line coverage, haltOnFailure=false) configured in the POM.
# Runs the pinned Maven Wrapper and enforces the JaCoCo coverage gates configured in the POM.
name: CI

on:
Expand All @@ -20,35 +19,35 @@ permissions:

jobs:
build:
name: JDK 17 Build & Verify
name: JDK 21 Build & Verify
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout source
uses: actions/checkout@v7

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: '17'
java-version: '21'
cache: maven

- name: Build and verify with JaCoCo coverage gate
run: mvn -B --no-transfer-progress clean verify
run: ./mvnw -B --no-transfer-progress clean verify

- name: Upload JaCoCo coverage report
if: always()
uses: actions/upload-artifact@v7
with:
name: jacoco-coverage
path: target/site/jacoco
path: '**/target/site/jacoco/**'
retention-days: 14

- name: Upload surefire reports
if: always()
uses: actions/upload-artifact@v7
with:
name: surefire-reports
path: target/surefire-reports
path: '**/target/surefire-reports/**'
retention-days: 14
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<revision>3.0.x.20261031-SNAPSHOT</revision>
<java.version>21</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.version>4.0.0-rc-5</maven.version>
<maven.version>4.0.0-rc-6</maven.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- ═══ 第二段: docx4j 全家桶版本 ═══ -->
Expand All @@ -72,7 +72,7 @@

<!-- ═══ 第四段: 模板引擎版本 ═══ -->
<beetl.version>3.21.2.RELEASE</beetl.version>
<freemarker.version>2.3.34</freemarker.version>
<freemarker.version>2.3.35</freemarker.version>
<httl.version>1.0.12</httl.version>
<jetbrick.version>2.1.10</jetbrick.version>
<rythm.version>1.4.2</rythm.version>
Expand All @@ -90,10 +90,10 @@
<!-- Markdown 解析（MD→HTML 渲染，Java 8 兼容） -->
<flexmark.version>0.64.8</flexmark.version>
<jackson-bom.version>3.2.1</jackson-bom.version>
<jsoup.version>1.23.1</jsoup.version>
<jsoup.version>1.23.2</jsoup.version>
<!-- fastjson：v1 兼容构建（内核 fastjson2），锁定 rythm-engine 传递依赖 -->
<fastjson.version>2.0.57</fastjson.version>
<ognl.version>3.4.2</ognl.version>
<ognl.version>3.4.13</ognl.version>
<tomcat-jasper.version>10.1.54</tomcat-jasper.version>

<!-- ═══ 第六段: 测试框架版本 ═══ -->
Expand Down
Loading