Skip to content

feat(maven): migrate to maven 4 #4455

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

Draft
mirogaudi wants to merge 50 commits into
base: master
Choose a base branch
from
Draft

feat(maven): migrate to maven 4 #4455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
774f167
feat(4422): Use Maven v3.9.10 via Maven Wrapper v3.3.2
Jul 1, 2025
c148505
feat(4422): Set enforcer to require Maven v3.9
Jul 1, 2025
a57683f
feat(4422): Do not use spring release repository. See: https://spring…
Jul 1, 2025
a4f6eb3
feat(4422): Switch from com.github.tomakehurst:wiremock-jre8-standalo…
Jul 1, 2025
2f26583
feat(4422): Use https
Jul 1, 2025
242ad5d
feat(4422): Clean up reactor pom
Jul 2, 2025
c8e12e4
feat(4422): Clean up reactor pom
Jul 2, 2025
412a2d9
feat(4422): Clean up modules poms
Jul 2, 2025
75bcda9
feat(4422): Update autogenerated frontend artifacts
Jul 2, 2025
40eeab6
feat(4422): Use Maven v4.0.0-rc-4 via Maven Wrapper v3.3.2
Jul 3, 2025
e86beb8
feat(4422): Set enforcer to require Maven v4.0.0-rc-4 or newer
Jul 3, 2025
da01ab7
feat(4422): Clean up code
Jul 3, 2025
8b22c79
feat(4422): Use Maven Wrapper in workflows
Jul 3, 2025
b1af53b
feat(4422): Replace deprecated ${basedir} with ${project.basedir}
Jul 3, 2025
e85f7ff
feat(4422): Clean up modules poms
Jul 3, 2025
22397a9
feat(4422): Clean up modules poms
Jul 3, 2025
a5e7531
feat(4422): Fix OpenJDK 64-Bit Server VM "sharing" warning
Jul 3, 2025
7bd202c
feat(4422): Maven 4 related fixes
Jul 4, 2025
a1151f0
feat(4422): Clean up modules poms
Jul 4, 2025
cc420d6
feat(4422): Clean up reactor pom
Jul 4, 2025
db03b57
Merge remote-tracking branch 'origin/master' into feat/migrate-to-mav…
Jul 7, 2025
5176c43
feat(4422): Clean up modules poms
Jul 7, 2025
386332c
feat(4422): Maven 4 related fixes: fix copy-resources
Jul 7, 2025
30831ef
feat(4422): Clean up reactor pom
Jul 7, 2025
2523a36
feat(4422): Maven 4 related fixes: fix copy-resources
Jul 7, 2025
ab1066a
feat(4422): Clean up modules poms
Jul 8, 2025
37cbda8
feat(4422): Clean up reactor pom
Jul 8, 2025
41be664
feat(4422): Clean up modules poms
Jul 8, 2025
66af1dc
feat(4422): Clean up reactor pom
Jul 8, 2025
1c298a2
Merge remote-tracking branch 'origin/master' into feat/migrate-to-mav…
Jul 10, 2025
546596b
feat(4422): Clean up
Jul 10, 2025
e902124
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 10, 2025
e368d1e
Merge remote-tracking branch 'origin/master' into feat/migrate-to-mav…
Jul 11, 2025
33e5965
Merge remote-tracking branch 'origin/master' into feat/migrate-to-mav…
Jul 16, 2025
07984b8
feat(4455): Clean up parent pom path
Jul 16, 2025
fad46fc
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 17, 2025
b2e691b
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 18, 2025
075d3fe
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 21, 2025
1c563e7
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 23, 2025
465fb46
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 25, 2025
4db8859
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 28, 2025
4c9e48e
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Jul 28, 2025
b5460ee
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Aug 4, 2025
7e0f62d
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Aug 6, 2025
960cfaf
Merge branch 'master' into feat/migrate-to-maven-4-part-2
mirogaudi Aug 7, 2025
b500a3e
Merge branch 'master' into feat/migrate-to-maven-4-part-2
SteKoe Sep 5, 2025
91e5fd1
Merge remote-tracking branch 'origin/master' into feat/migrate-to-mav…
SteKoe Nov 16, 2025
49d931b
fix: update Maven distribution URL to version 4.0.0-rc-5
SteKoe Nov 16, 2025
69d13e4
Merge remote-tracking branch 'origin/master' into feat/migrate-to-mav…
SteKoe Nov 18, 2025
6d1f18b
Merge branch 'master' into feat/migrate-to-maven-4-part-2
SteKoe Dec 12, 2025
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
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
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
6 changes: 5 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<java.version>17</java.version>
<node.version>v22.12.0</node.version>

<require.maven.version>3.9</require.maven.version>
<require.maven.version>[4.0.0-rc-4,)</require.maven.version>
Copy link
Contributor Author

@mirogaudi mirogaudi Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The required version can be 4.0.0-rc-5


<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand All @@ -46,6 +46,9 @@
<!-- disable default maven site generation, but allow docusarus to hook into site lifecycle -->
<maven.site.skip>true</maven.site.skip>

<!-- required for later replacement of argLine -->
<argLine/>

<!-- used dependencies versions -->
<spring-boot.version>3.5.8</spring-boot.version>
<spring-cloud.version>2025.0.0</spring-cloud.version>
Expand Down Expand Up @@ -365,6 +368,7 @@
<useUnlimitedThreads>false</useUnlimitedThreads>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<rerunFailingTestsCount>2</rerunFailingTestsCount>
<argLine>@{argLine} -Xshare:off</argLine>
<includes>
<include>**/*Tests.java</include>
<include>**/*Test.java</include>
Expand Down
16 changes: 13 additions & 3 deletions spring-boot-admin-build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,24 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-dependencies</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-dependencies</relativePath>
<relativePath>../spring-boot-admin-dependencies/pom.xml</relativePath>
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<!-- hardcoded to fix issues with cyclonedx-maven-plugin, should be ${spring-boot.version} -->
<version>3.5.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<!-- hardcoded to fix issues with cyclonedx-maven-plugin, should be ${spring-cloud.version} -->
<version>2025.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -97,6 +99,14 @@
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>

<!-- Maven 4 related fixes: delete as soon as not needed! -->
<dependency>
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
<version>2.0.12</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-server-cloud/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-server-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-starter-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin-starter-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
<relativePath>../spring-boot-admin-build/pom.xml</relativePath>
</parent>

<dependencies>
Expand Down