Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1f9c9fe

Browse files
committed
Merge branch '2.1.x'
Closes gh-18409 
2 parents 3c4fef8 + 89e7d5f commit 1f9c9fe

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public TaskExecutorBuilder taskExecutorBuilder(TaskExecutionProperties propertie
6767
builder = builder.awaitTermination(shutdown.isAwaitTermination());
6868
builder = builder.awaitTerminationPeriod(shutdown.getAwaitTerminationPeriod());
6969
builder = builder.threadNamePrefix(properties.getThreadNamePrefix());
70-
builder = builder.customizers(taskExecutorCustomizers);
70+
builder = builder.customizers(taskExecutorCustomizers.orderedStream()::iterator);
7171
builder = builder.taskDecorator(taskDecorator.getIfUnique());
7272
return builder;
7373
}

‎spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
<hsqldb.version>2.5.0</hsqldb.version>
7979
<htmlunit.version>2.36.0</htmlunit.version>
8080
<httpasyncclient.version>4.1.4</httpasyncclient.version>
81-
<httpclient.version>4.5.9</httpclient.version>
81+
<httpclient.version>4.5.10</httpclient.version>
8282
<httpcore.version>4.4.12</httpcore.version>
8383
<infinispan.version>9.4.16.Final</infinispan.version>
8484
<influxdb-java.version>2.15</influxdb-java.version>
85-
<!-- deprecated since 2.18 in favor of "jackson-bom.version" -->
85+
<!-- deprecated since 2.1 in favor of "jackson-bom.version" -->
8686
<jackson.version>2.10.0</jackson.version>
8787
<jackson-bom.version>${jackson.version}</jackson-bom.version>
8888
<jakarta-activation.version>1.2.1</jakarta-activation.version>
@@ -130,7 +130,7 @@
130130
<jetty-reactive-httpclient.version>1.0.3</jetty-reactive-httpclient.version>
131131
<jmustache.version>1.15</jmustache.version>
132132
<jna.version>4.5.2</jna.version>
133-
<joda-time.version>2.10.3</joda-time.version>
133+
<joda-time.version>2.10.4</joda-time.version>
134134
<jolokia.version>1.6.2</jolokia.version>
135135
<!-- Deprecated in favor of "johnzon.version" -->
136136
<johnzon-jsonb.version>1.1.13</johnzon-jsonb.version>
@@ -161,7 +161,7 @@
161161
<nekohtml.version>1.9.22</nekohtml.version>
162162
<neo4j-ogm.version>3.2.0-RC2</neo4j-ogm.version>
163163
<netty.version>4.1.39.Final</netty.version>
164-
<netty-tcnative.version>2.0.25.Final</netty-tcnative.version>
164+
<netty-tcnative.version>2.0.26.Final</netty-tcnative.version>
165165
<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
166166
<ojdbc.version>19.3.0.0</ojdbc.version>
167167
<okhttp3.version>3.14.2</okhttp3.version>
@@ -207,7 +207,7 @@
207207
<thymeleaf-layout-dialect.version>2.4.1</thymeleaf-layout-dialect.version>
208208
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
209209
<thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
210-
<tomcat.version>9.0.24</tomcat.version>
210+
<tomcat.version>9.0.26</tomcat.version>
211211
<unboundid-ldapsdk.version>4.0.11</unboundid-ldapsdk.version>
212212
<undertow.version>2.0.26.Final</undertow.version>
213213
<webjars-hal-browser.version>3325375</webjars-hal-browser.version>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /