root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Start building against Spring Framework 5.2.4 snapshots 

See gh-20199
This commit is contained in:
Stephane Nicoll 2020-02-20 13:35:02 +01:00
parent ef0d881846
commit 67d2258e76
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -73,7 +73,7 @@ class TaskExecutionAutoConfigurationTests {
assertThat(taskExecutor).hasFieldOrPropertyWithValue("allowCoreThreadTimeOut", true); assertThat(taskExecutor).hasFieldOrPropertyWithValue("allowCoreThreadTimeOut", true);
assertThat(taskExecutor.getKeepAliveSeconds()).isEqualTo(5); assertThat(taskExecutor.getKeepAliveSeconds()).isEqualTo(5);
assertThat(taskExecutor).hasFieldOrPropertyWithValue("waitForTasksToCompleteOnShutdown", true); assertThat(taskExecutor).hasFieldOrPropertyWithValue("waitForTasksToCompleteOnShutdown", true);
assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 30); assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationMillis", 30000L);
assertThat(taskExecutor.getThreadNamePrefix()).isEqualTo("mytest-"); assertThat(taskExecutor.getThreadNamePrefix()).isEqualTo("mytest-");
})); }));
} }

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -68,7 +68,7 @@ class TaskSchedulingAutoConfigurationTests {
TestBean bean = context.getBean(TestBean.class); TestBean bean = context.getBean(TestBean.class);
assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue(); assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue();
assertThat(taskExecutor).hasFieldOrPropertyWithValue("waitForTasksToCompleteOnShutdown", true); assertThat(taskExecutor).hasFieldOrPropertyWithValue("waitForTasksToCompleteOnShutdown", true);
assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 30); assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationMillis", 30000L);
assertThat(bean.threadNames).allMatch((name) -> name.contains("scheduling-test-")); assertThat(bean.threadNames).allMatch((name) -> name.contains("scheduling-test-"));
}); });
} }

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -189,7 +189,7 @@
<spring-batch.version>4.2.1.RELEASE</spring-batch.version> <spring-batch.version>4.2.1.RELEASE</spring-batch.version>
<spring-cloud-connectors.version>2.0.7.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>2.0.7.RELEASE</spring-cloud-connectors.version>
<spring-data-releasetrain.version>Moore-SR4</spring-data-releasetrain.version> <spring-data-releasetrain.version>Moore-SR4</spring-data-releasetrain.version>
<spring-framework.version>5.2.3.RELEASE</spring-framework.version> <spring-framework.version>5.2.4.BUILD-SNAPSHOT</spring-framework.version>
<spring-hateoas.version>1.0.3.RELEASE</spring-hateoas.version> <spring-hateoas.version>1.0.3.RELEASE</spring-hateoas.version>
<spring-integration.version>5.2.3.RELEASE</spring-integration.version> <spring-integration.version>5.2.3.RELEASE</spring-integration.version>
<spring-kafka.version>2.3.5.RELEASE</spring-kafka.version> <spring-kafka.version>2.3.5.RELEASE</spring-kafka.version>

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskExecutorBuilderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -62,8 +62,9 @@ class TaskExecutorBuilderTests {
@Test @Test
void awaitTerminationPeriodShouldApply() { void awaitTerminationPeriodShouldApply() {
ThreadPoolTaskExecutor executor = this.builder.awaitTerminationPeriod(Duration.ofMinutes(1)).build(); Duration period = Duration.ofMinutes(1);
assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 60); ThreadPoolTaskExecutor executor = this.builder.awaitTerminationPeriod(period).build();
assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationMillis", period.toMillis());
} }
@Test @Test

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskSchedulerBuilderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -54,8 +54,9 @@ class TaskSchedulerBuilderTests {
@Test @Test
void awaitTerminationPeriodShouldApply() { void awaitTerminationPeriodShouldApply() {
ThreadPoolTaskScheduler executor = this.builder.awaitTerminationPeriod(Duration.ofMinutes(1)).build(); Duration period = Duration.ofMinutes(1);
assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 60); ThreadPoolTaskScheduler executor = this.builder.awaitTerminationPeriod(period).build();
assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationMillis", period.toMillis());
} }
@Test @Test