Skip to content

Feat/migrate to maven 4 part 1 #4439

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
merged 11 commits into from
Jul 7, 2025
Merged

Feat/migrate to maven 4 part 1 #4439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 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
65239cc
Merge remote-tracking branch 'origin/master' into feat/migrate-to-mav…
Jul 4, 2025
95b1d13
Merge branch 'master' into feat/migrate-to-maven-4-part-1
mirogaudi Jul 7, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java
View file
Open in desktop

This file was deleted.

Binary file removed .mvn/wrapper/maven-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
19 changes: 14 additions & 5 deletions mvnw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.3.0
# Apache Maven Wrapper startup batch script, version 3.3.2
#
# Optional ENV vars
# -----------------
Expand Down Expand Up @@ -97,11 +97,19 @@ die() {
exit 1
}

trim() {
# MWRAPPER-139:
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
# Needed for removing poorly interpreted newline sequences when running in more
# exotic environments such as mingw bash on Windows.
printf "%s" "${1}" | tr -d '[:space:]'
}

# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
while IFS="=" read -r key value; do
case "${key-}" in
distributionUrl) distributionUrl="${value-}" ;;
distributionSha256Sum) distributionSha256Sum="${value-}" ;;
distributionUrl) distributionUrl=$(trim "${value-}") ;;
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
esac
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
Expand Down Expand Up @@ -131,7 +139,8 @@ esac
distributionUrlName="${distributionUrl##*/}"
distributionUrlNameMain="${distributionUrlName%.*}"
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"

exec_maven() {
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
Expand Down Expand Up @@ -199,7 +208,7 @@ elif set_java_home; then
public static void main( String[] args ) throws Exception
{
setDefault( new Downloader() );
java.nio.file.Files.copy( new java.net.URL( args[0] ).openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
}
}
END
Expand Down
5 changes: 4 additions & 1 deletion mvnw.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@REM ----------------------------------------------------------------------------

@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.0
@REM Apache Maven Wrapper startup batch script, version 3.3.2
@REM
@REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution
Expand Down Expand Up @@ -79,6 +79,9 @@ if ($env:MVNW_REPOURL) {
$distributionUrlName = $distributionUrl -replace '^.*/',''
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
if ($env:MAVEN_USER_HOME) {
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
}
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"

Expand Down
59 changes: 29 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,22 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId>
<version>${revision}</version>

<packaging>pom</packaging>

<name>Spring Boot Admin</name>
<description>Spring Boot Admin</description>
<url>https://github.com/codecentric/spring-boot-admin/</url>

<properties>
<revision>3.5.2-SNAPSHOT</revision>

<java.version>17</java.version>
<node.version>v22.12.0</node.version>

<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand All @@ -38,19 +44,22 @@
<!-- used dependencies versions -->
<spring-boot.version>3.5.3</spring-boot.version>
<spring-cloud.version>2025.0.0</spring-cloud.version>
<wiremock.version>3.0.1</wiremock.version>
<hazelcast-tests.version>5.5.0</hazelcast-tests.version>
<jolokia-support-spring.version>2.2.9</jolokia-support-spring.version>

<checkstyle.version>10.26.1</checkstyle.version>
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>

<wiremock.version>3.0.3</wiremock.version>
<hazelcast-tests.version>5.5.0</hazelcast-tests.version>
<awaitility.version>4.3.0</awaitility.version>
<testcontainers.version>1.21.3</testcontainers.version>
<eureka-client.version>3.1.1</eureka-client.version>
<jetty.version>12.0.23</jetty.version>

<!-- plugin versions -->
<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<versions-maven-plugin.version>2.18.0
</versions-maven-plugin.version> <!-- because of https://github.com/mojohaus/versions/issues/855 -->
<!-- because of https://github.com/mojohaus/versions/issues/855 -->
<versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
<maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
Expand All @@ -67,19 +76,15 @@
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
<asciidoctor-maven-plugin.version>3.1.0</asciidoctor-maven-plugin.version>
<asciidoctor-converter-doxia-module.version>3.1.0</asciidoctor-converter-doxia-module.version>
<asciidoctor-maven-plugin.version>3.2.0</asciidoctor-maven-plugin.version>
<asciidoctor-converter-doxia-module.version>3.1.1</asciidoctor-converter-doxia-module.version>
<git-commit-id-maven-plugin.version>4.9.10</git-commit-id-maven-plugin.version>
<flatten-maven-plugin.version>1.7.1</flatten-maven-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<checkstyle.version>10.26.1</checkstyle.version>
<spring-javaformat-checkstyle.version>0.0.47</spring-javaformat-checkstyle.version>
<spring-javaformat-maven-plugin.version>0.0.47</spring-javaformat-maven-plugin.version>
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
<node.version>v22.12.0</node.version>
<jolokia-support-spring.version>2.2.9</jolokia-support-spring.version>
</properties>

<modules>
<module>spring-boot-admin-server</module>
<module>spring-boot-admin-server-ui</module>
Expand All @@ -91,28 +96,33 @@
<module>spring-boot-admin-starter-client</module>
<module>spring-boot-admin-samples</module>
</modules>

<organization>
<name>codecentric AG</name>
<url>http://www.codecentric.de</url>
<url>https://www.codecentric.de</url>
</organization>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>

<scm>
<connection>scm:git:git://github.com/codecentric/spring-boot-admin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/codecentric/spring-boot-admin.git</developerConnection>
<url>https://github.com/codecentric/spring-boot-admin</url>
</scm>

<developers>
<developer>
<name>codecentric AG</name>
<email>spring-boot-admin@codecentric.de</email>
<url>https://www.codecentric.de/</url>
</developer>
</developers>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -215,7 +225,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5</version>
<version>3.9</version>
</requireMavenVersion>
</rules>
</configuration>
Expand All @@ -225,7 +235,7 @@
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<version>${spring-javaformat-checkstyle.version}</version>
<version>${spring-javaformat-maven-plugin.version}</version>
<executions>
<execution>
<phase>validate</phase>
Expand All @@ -237,6 +247,7 @@
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -362,7 +373,7 @@
<dependency>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-checkstyle</artifactId>
<version>${spring-javaformat-checkstyle.version}</version>
<version>${spring-javaformat-maven-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -394,6 +405,7 @@
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>include-cloud</id>
Expand Down Expand Up @@ -480,13 +492,6 @@
</property>
</activation>
<repositories>
<repository>
<id>spring-release</id>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://repo.spring.io/release</url>
</repository>
<repository>
<id>spring-milestone</id>
<snapshots>
Expand All @@ -512,13 +517,6 @@
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-release</id>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://repo.spring.io/release</url>
</pluginRepository>
<pluginRepository>
<id>spring-milestone</id>
<snapshots>
Expand All @@ -536,6 +534,7 @@
</pluginRepositories>
</profile>
</profiles>

<distributionManagement>
<snapshotRepository>
<id>github</id>
Expand Down
Loading
Loading