Skip to content

Commit

Permalink
Merge pull request #37 from spt-development/feature/spring-boot-3.4.1…
Browse files Browse the repository at this point in the history
…-upgrade

Updated dependencies to align with Spring Boot 3.4.1
  • Loading branch information
SimonTaylor authored Dec 20, 2024
2 parents 619fab9 + 14b6972 commit 7b57554
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 18 deletions.
3 changes: 3 additions & 0 deletions documentation/releases/release-3.0.25.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Dependencies

* Aligned dependencies with [Spring Boot 3.1.0](https://github.com/spring-projects/spring-boot/releases/tag/v3.4.1)
29 changes: 11 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,42 @@
<aspectj.version>1.9.22.1</aspectj.version>
<jakarta-jms.version>3.1.0</jakarta-jms.version>
<slf4j.version>2.0.16</slf4j.version>
<spring.version>6.2.0</spring.version>
<spring.version>6.2.1</spring.version>

<!-- Test dependency versions, matched to Spring Boot -->
<hamcrest.version>2.2</hamcrest.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<junit-jupiter.version>5.11.4</junit-jupiter.version>
<logback.version>1.5.12</logback.version>
<mockito.version>5.14.2</mockito.version>

<!-- Plugin versions -->
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<checkstyle-maven-plugin.version>3.6.0</checkstyle-maven-plugin.version>
<dependency-check-maven.version>11.1.0</dependency-check-maven.version>
<dependency-check-maven.version>11.1.1</dependency-check-maven.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
<license-maven-plugin.version>2.5.0</license-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-jxr-plugin.version>3.6.0</maven-jxr-plugin.version>
<maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
<maven-scm-plugin.version>2.1.0</maven-scm-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>
<pitest-maven.version>1.17.1</pitest-maven.version>
<pitest-maven.version>1.17.3</pitest-maven.version>
<spotbugs.version>4.8.6.6</spotbugs.version>
<versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>

<!-- Plugin dependencies -->
<checkstyle.version>10.20.1</checkstyle.version>
<checkstyle.version>10.21.0</checkstyle.version>
<findbugs-slf4j-bug-pattern.version>1.5.0</findbugs-slf4j-bug-pattern.version>
<findbugs-sec-bug-pattern.version>1.13.0</findbugs-sec-bug-pattern.version>
<pitest-junit5-plugin.version>1.2.1</pitest-junit5-plugin.version>
<pmd.version>7.7.0</pmd.version>
<pmd.version>7.8.0</pmd.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -374,15 +374,6 @@
<version>${maven-surefire-plugin.version}</version>
<configuration>
<!--
Prevents the following warning introduced in JDK 21, caused by Mockito or more specifically byte-buddy-agent:
WARNING: A Java agent has been loaded dynamically (/Users/khm/.m2/repository/net/bytebuddy/byte-buddy-agent/1.14.5/byte-buddy-agent-1.14.5.jar)
WARNING: If a serviceability tool is in use, please run with -XX:+EnableDynamicAgentLoading to hide this warning
WARNING: If a serviceability tool is not in use, please run with -Djdk.instrument.traceUsage for more information
WARNING: Dynamic loading of agents will be disallowed by default in a future release
NOTE. argLine property is set by JaCoCo in prepare-agent stage.
Starting from Java 21, the JDK restricts the ability of libraries to attach a Java agent to their own JVM. As a result, the inline-mock-maker might not be
able to function without an explicit setup to enable instrumentation, and the JVM will always display a warning.
Expand All @@ -391,8 +382,10 @@
@{argLine} -javaagent:${org.mockito:mockito-core:jar}
Additionally, the `properties` goal of the `maven-dependency-plugin` must be executed.
NOTE. argLine property is set by JaCoCo in prepare-agent stage.
-->
<argLine>-XX:+EnableDynamicAgentLoading @{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
<argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
<trimStackTrace>false</trimStackTrace>
<includes>
<include>**/*Tests.java</include>
Expand Down

0 comments on commit 7b57554

Please sign in to comment.