Upgrade test and dev dependencies; prepare for release
This commit is contained in:
18
pom.xml
18
pom.xml
@@ -32,11 +32,11 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
|
||||
<aspectj.version>1.9.22.1</aspectj.version>
|
||||
<assertj.version>3.26.3</assertj.version>
|
||||
<junit-jupiter.version>5.11.3</junit-jupiter.version>
|
||||
<log4j.version>2.24.2</log4j.version>
|
||||
<mockito.version>5.14.2</mockito.version>
|
||||
<aspectj.version>1.9.24</aspectj.version>
|
||||
<assertj.version>3.27.3</assertj.version>
|
||||
<junit-jupiter.version>5.12.2</junit-jupiter.version>
|
||||
<log4j.version>2.24.3</log4j.version>
|
||||
<mockito.version>5.17.0</mockito.version>
|
||||
<spring.framework.version>6.0.23</spring.framework.version>
|
||||
<micrometer.version>1.10.13</micrometer.version>
|
||||
</properties>
|
||||
@@ -187,12 +187,12 @@
|
||||
<plugin>
|
||||
<groupId>io.spring.javaformat</groupId>
|
||||
<artifactId>spring-javaformat-maven-plugin</artifactId>
|
||||
<version>0.0.43</version>
|
||||
<version>0.0.44</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.13.0</version>
|
||||
<version>3.14.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@@ -212,7 +212,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.5.2</version>
|
||||
<version>3.5.3</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.gradle</groupId>
|
||||
@@ -306,7 +306,7 @@
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>flatten-maven-plugin</artifactId>
|
||||
<version>1.6.0</version>
|
||||
<version>1.7.0</version>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}</outputDirectory>
|
||||
<flattenMode>oss</flattenMode>
|
||||
|
||||
@@ -87,8 +87,7 @@ public interface RetryContext extends AttributeAccessor {
|
||||
* Accessor for the parent context if retry blocks are nested.
|
||||
* @return the parent or null if there is none.
|
||||
*/
|
||||
@Nullable
|
||||
RetryContext getParent();
|
||||
@Nullable RetryContext getParent();
|
||||
|
||||
/**
|
||||
* Counts the number of retry attempts. Before the first attempt this counter is zero,
|
||||
@@ -104,7 +103,6 @@ public interface RetryContext extends AttributeAccessor {
|
||||
* enclosing policy decides not to provide it (e.g. because of concerns about memory
|
||||
* usage).
|
||||
*/
|
||||
@Nullable
|
||||
Throwable getLastThrowable();
|
||||
@Nullable Throwable getLastThrowable();
|
||||
|
||||
}
|
||||
|
||||
@@ -71,8 +71,7 @@ public final class RetrySynchronizationManager {
|
||||
* Public accessor for the locally enclosing {@link RetryContext}.
|
||||
* @return the current retry context, or null if there isn't one
|
||||
*/
|
||||
@Nullable
|
||||
public static RetryContext getContext() {
|
||||
@Nullable public static RetryContext getContext() {
|
||||
if (useThreadLocal) {
|
||||
return context.get();
|
||||
}
|
||||
@@ -88,8 +87,7 @@ public final class RetrySynchronizationManager {
|
||||
* @param context the new context to register
|
||||
* @return the old context if there was one
|
||||
*/
|
||||
@Nullable
|
||||
public static RetryContext register(RetryContext context) {
|
||||
@Nullable public static RetryContext register(RetryContext context) {
|
||||
if (useThreadLocal) {
|
||||
RetryContext oldContext = getContext();
|
||||
RetrySynchronizationManager.context.set(context);
|
||||
@@ -107,8 +105,7 @@ public final class RetrySynchronizationManager {
|
||||
* {@link RetryOperations} implementations.
|
||||
* @return the old value if there was one.
|
||||
*/
|
||||
@Nullable
|
||||
public static RetryContext clear() {
|
||||
@Nullable public static RetryContext clear() {
|
||||
RetryContext value = getContext();
|
||||
RetryContext parent = value == null ? null : value.getParent();
|
||||
if (useThreadLocal) {
|
||||
|
||||
Reference in New Issue
Block a user