Skip to content

Commit fa60608

Browse files
committed
fix(pom): normalize pom.xml per java-component-patterns
- Remove source/target, use release only - Fix maven.version per branch - Fix enforcer requireMavenVersion for Maven 4 (3.0.x) - Fix java.version values - Fix maven-wrapper.properties - Add properties 3-part comments
1 parent 412421f commit fa60608

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
wrapperVersion=3.3.4
22
distributionType=only-script
3-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-6/apache-maven-4.0.0-rc-6-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-5/apache-maven-4.0.0-rc-5-bin.zip

‎pom.xml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,10 @@
5252

5353
<!-- 版本属性定义:Java 版本、依赖版本与 Maven 插件版本统一管理 -->
5454
<properties>
55+
<!-- ═══ 第一段: 基础属性(自然排序)═══ -->
5556
<java.version>21</java.version>
5657
<maven.compiler.release>${java.version}</maven.compiler.release>
57-
<maven.compiler.source>${java.version}</maven.compiler.source>
58-
<maven.compiler.target>${java.version}</maven.compiler.target>
59-
<maven.version>3.0</maven.version>
58+
<maven.version>4.0.0-rc-5</maven.version>
6059
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6160
<!-- Dependency versions -->
6261
<commons-exec.version>1.6.0</commons-exec.version>
@@ -204,10 +203,6 @@
204203
<artifactId>maven-compiler-plugin</artifactId>
205204
<version>${maven-compiler-plugin.version}</version>
206205
<configuration>
207-
<!-- 源代码编译版本 -->
208-
<source>${java.version}</source>
209-
<!-- 目标平台编译版本 -->
210-
<target>${java.version}</target>
211206
<!-- 字符集编码 -->
212207
<encoding>${project.build.sourceEncoding}</encoding>
213208
<!-- 编译最大内存 -->
@@ -246,8 +241,8 @@
246241
<configuration>
247242
<rules>
248243
<requireMavenVersion>
249-
<message>You are running an older version of Maven. This application requires at least Maven ${maven.version}.</message>
250-
<version>[${maven.version}.0,)</version>
244+
<message><![CDATA[You are running an older version of Maven. This application requires at least Maven 4.]]></message>
245+
<version>[4.0.0,)</version>
251246
</requireMavenVersion>
252247
<requireJavaVersion>
253248
<message>You are running an older version of Java. This application requires at least JDK ${java.version}.</message>
@@ -460,8 +455,6 @@
460455
<artifactId>maven-compiler-plugin</artifactId>
461456
<version>${maven-compiler-plugin.version}</version>
462457
<configuration>
463-
<source>${java.version}</source>
464-
<target>${java.version}</target>
465458
<!-- 保留方法参数名,支持 Spring MVC 按参数名绑定 -->
466459
<parameters>true</parameters>
467460
<encoding>${project.build.sourceEncoding}</encoding>

0 commit comments

Comments
 (0)