Skip to content

Commit 7e4d34f

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 e3f91f6 commit 7e4d34f

2 files changed

Lines changed: 6 additions & 13 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: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@
4747
</distributionManagement>
4848

4949
<properties>
50+
<!-- ═══ 第一段: 基础属性(自然排序)═══ -->
5051
<java.version>21</java.version>
5152
<maven.compiler.release>${java.version}</maven.compiler.release>
52-
<maven.compiler.source>${java.version}</maven.compiler.source>
53-
<maven.compiler.target>${java.version}</maven.compiler.target>
54-
<maven.version>3.0</maven.version>
53+
<maven.version>4.0.0-rc-5</maven.version>
5554
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5655
<!-- Dependency versions -->
5756
<commons-exec.version>1.6.0</commons-exec.version>
@@ -226,10 +225,6 @@
226225
<configuration>
227226
<release>${java.version}</release>
228227

229-
<source>${java.version}</source>
230-
231-
<target>${java.version}</target>
232-
233228
<encoding>${project.build.sourceEncoding}</encoding>
234229

235230
<maxmem>512M</maxmem>
@@ -265,11 +260,9 @@
265260
<configuration>
266261
<rules>
267262
<requireMavenVersion>
268-
<message>
269-
You are running an older version of Maven. This application requires at least Maven ${maven.version}.
270-
</message>
271-
<version>[${maven.version}.0,)</version>
272-
</requireMavenVersion>
263+
<message><![CDATA[You are running an older version of Maven. This application requires at least Maven 4.]]></message>
264+
<version>[4.0.0,)</version>
265+
</requireMavenVersion>
273266
<requireJavaVersion>
274267
<message>
275268
You are running an older version of Java. This application requires at least JDK ${java.version}.

0 commit comments

Comments
 (0)