Skip to content

Commit 178add9

Browse files
committed
feat(build): 更新Java版本配置并优化CI流程
- 将pom.xml中的java.version从25回退至17以保持兼容性 - 在CI流程中使用maven.compiler.release替代source/target参数 - 移除nacos-discovery依赖中冗余的logback-adapter排除配置 - 保持原有spring-javaformat验证和自动格式化功能 Signed-off-by: PIGCLOUD <[email protected]>
1 parent 5e21498 commit 178add9

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.github/workflows/maven.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323

2424
- name: mvn spring-javaformat:validate
2525
id: validate
26-
run: mvn spring-javaformat:validate -Dmaven.compiler.source=${{ matrix.java-version }} -Dmaven.compiler.target=${{ matrix.java-version }}
26+
run: mvn spring-javaformat:validate -Dmaven.compiler.release=${{ matrix.java-version }}
2727
continue-on-error: true
2828

2929
- name: Auto format code if validation fails
3030
if: steps.validate.outcome == 'failure'
31-
run: mvn spring-javaformat:apply -Dmaven.compiler.source=${{ matrix.java-version }} -Dmaven.compiler.target=${{ matrix.java-version }}
31+
run: mvn spring-javaformat:apply -Dmaven.compiler.release=${{ matrix.java-version }}
3232

3333
- name: Create Pull Request for formatting changes
3434
if: steps.validate.outcome == 'failure'
@@ -48,10 +48,10 @@ jobs:
4848
delete-branch: true
4949

5050
- name: mvn clean install
51-
run: mvn clean install -Pboot -Dmaven.compiler.source=${{ matrix.java-version }} -Dmaven.compiler.target=${{ matrix.java-version }}
51+
run: mvn clean install -Pboot -Dmaven.compiler.release=${{ matrix.java-version }}
5252

5353
- name: mvn clean install
54-
run: mvn clean install -Dmaven.compiler.source=${{ matrix.java-version }} -Dmaven.compiler.target=${{ matrix.java-version }}
54+
run: mvn clean install -Dmaven.compiler.release=${{ matrix.java-version }}
5555

5656
- name: failure
5757
if: failure() && github.repository == 'pig-mesh/pig'

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<properties>
2828
<!-- 项目版本号 -->
2929
<revision>3.9.2</revision>
30-
<java.version>25</java.version>
30+
<java.version>17</java.version>
3131
<spring-boot.version>3.5.7</spring-boot.version>
3232
<spring-cloud.version>2025.0.0</spring-cloud.version>
3333
<spring-cloud-alibaba.version>2025.0.0.0</spring-cloud-alibaba.version>
@@ -159,12 +159,6 @@
159159
<groupId>com.alibaba.cloud</groupId>
160160
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
161161
<version>${spring-cloud-alibaba.version}</version>
162-
<exclusions>
163-
<exclusion>
164-
<artifactId>logback-adapter</artifactId>
165-
<groupId>com.alibaba.nacos</groupId>
166-
</exclusion>
167-
</exclusions>
168162
</dependency>
169163
</dependencies>
170164
</dependencyManagement>

0 commit comments

Comments
 (0)