Skip to content

Commit f4cd357

Browse files
committed
Upgrade test and dev dependencies; prepare for release
1 parent a05e3a1 commit f4cd357

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3434

35-
<aspectj.version>1.9.22.1</aspectj.version>
36-
<assertj.version>3.26.3</assertj.version>
37-
<junit-jupiter.version>5.11.3</junit-jupiter.version>
38-
<log4j.version>2.24.2</log4j.version>
39-
<mockito.version>5.14.2</mockito.version>
35+
<aspectj.version>1.9.24</aspectj.version>
36+
<assertj.version>3.27.3</assertj.version>
37+
<junit-jupiter.version>5.12.2</junit-jupiter.version>
38+
<log4j.version>2.24.3</log4j.version>
39+
<mockito.version>5.17.0</mockito.version>
4040
<spring.framework.version>6.0.23</spring.framework.version>
4141
<micrometer.version>1.10.13</micrometer.version>
4242
</properties>
@@ -187,12 +187,12 @@
187187
<plugin>
188188
<groupId>io.spring.javaformat</groupId>
189189
<artifactId>spring-javaformat-maven-plugin</artifactId>
190-
<version>0.0.43</version>
190+
<version>0.0.44</version>
191191
</plugin>
192192
<plugin>
193193
<groupId>org.apache.maven.plugins</groupId>
194194
<artifactId>maven-compiler-plugin</artifactId>
195-
<version>3.13.0</version>
195+
<version>3.14.0</version>
196196
</plugin>
197197
<plugin>
198198
<groupId>org.apache.maven.plugins</groupId>
@@ -212,7 +212,7 @@
212212
<plugin>
213213
<groupId>org.apache.maven.plugins</groupId>
214214
<artifactId>maven-surefire-plugin</artifactId>
215-
<version>3.5.2</version>
215+
<version>3.5.3</version>
216216
</plugin>
217217
<plugin>
218218
<groupId>com.gradle</groupId>
@@ -306,7 +306,7 @@
306306
<plugin>
307307
<groupId>org.codehaus.mojo</groupId>
308308
<artifactId>flatten-maven-plugin</artifactId>
309-
<version>1.6.0</version>
309+
<version>1.7.0</version>
310310
<configuration>
311311
<outputDirectory>${project.build.directory}</outputDirectory>
312312
<flattenMode>oss</flattenMode>

src/main/java/org/springframework/retry/RetryContext.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ public interface RetryContext extends AttributeAccessor {
8787
* Accessor for the parent context if retry blocks are nested.
8888
* @return the parent or null if there is none.
8989
*/
90-
@Nullable
91-
RetryContext getParent();
90+
@Nullable RetryContext getParent();
9291

9392
/**
9493
* Counts the number of retry attempts. Before the first attempt this counter is zero,
@@ -104,7 +103,6 @@ public interface RetryContext extends AttributeAccessor {
104103
* enclosing policy decides not to provide it (e.g. because of concerns about memory
105104
* usage).
106105
*/
107-
@Nullable
108-
Throwable getLastThrowable();
106+
@Nullable Throwable getLastThrowable();
109107

110108
}

src/main/java/org/springframework/retry/support/RetrySynchronizationManager.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ public static boolean isUseThreadLocal() {
7171
* Public accessor for the locally enclosing {@link RetryContext}.
7272
* @return the current retry context, or null if there isn't one
7373
*/
74-
@Nullable
75-
public static RetryContext getContext() {
74+
@Nullable public static RetryContext getContext() {
7675
if (useThreadLocal) {
7776
return context.get();
7877
}
@@ -88,8 +87,7 @@ public static RetryContext getContext() {
8887
* @param context the new context to register
8988
* @return the old context if there was one
9089
*/
91-
@Nullable
92-
public static RetryContext register(RetryContext context) {
90+
@Nullable public static RetryContext register(RetryContext context) {
9391
if (useThreadLocal) {
9492
RetryContext oldContext = getContext();
9593
RetrySynchronizationManager.context.set(context);
@@ -107,8 +105,7 @@ public static RetryContext register(RetryContext context) {
107105
* {@link RetryOperations} implementations.
108106
* @return the old value if there was one.
109107
*/
110-
@Nullable
111-
public static RetryContext clear() {
108+
@Nullable public static RetryContext clear() {
112109
RetryContext value = getContext();
113110
RetryContext parent = value == null ? null : value.getParent();
114111
if (useThreadLocal) {

0 commit comments

Comments
 (0)