From 67d2258e76dd6391b54b360823c66a1739d10c3c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 Feb 2020 13:35:02 +0100 Subject: [PATCH 1/6] Start building against Spring Framework 5.2.4 snapshots See gh-20199 --- .../task/TaskExecutionAutoConfigurationTests.java | 4 ++-- .../task/TaskSchedulingAutoConfigurationTests.java | 4 ++-- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- .../boot/task/TaskExecutorBuilderTests.java | 7 ++++--- .../boot/task/TaskSchedulerBuilderTests.java | 7 ++++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java index 8f75dd89be..d714694c11 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java @@ -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"); * 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.getKeepAliveSeconds()).isEqualTo(5); assertThat(taskExecutor).hasFieldOrPropertyWithValue("waitForTasksToCompleteOnShutdown", true); - assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 30); + assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationMillis", 30000L); assertThat(taskExecutor.getThreadNamePrefix()).isEqualTo("mytest-"); })); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java index 3dd530e16c..ac8ef5c487 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ class TaskSchedulingAutoConfigurationTests { TestBean bean = context.getBean(TestBean.class); assertThat(bean.latch.await(30, TimeUnit.SECONDS)).isTrue(); assertThat(taskExecutor).hasFieldOrPropertyWithValue("waitForTasksToCompleteOnShutdown", true); - assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 30); + assertThat(taskExecutor).hasFieldOrPropertyWithValue("awaitTerminationMillis", 30000L); assertThat(bean.threadNames).allMatch((name) -> name.contains("scheduling-test-")); }); } diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 5a34f990c3..00d8e4d216 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -189,7 +189,7 @@ 4.2.1.RELEASE 2.0.7.RELEASE Moore-SR4 - 5.2.3.RELEASE + 5.2.4.BUILD-SNAPSHOT 1.0.3.RELEASE 5.2.3.RELEASE 2.3.5.RELEASE diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskExecutorBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskExecutorBuilderTests.java index 3d7838feea..763d6af607 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskExecutorBuilderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskExecutorBuilderTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -62,8 +62,9 @@ class TaskExecutorBuilderTests { @Test void awaitTerminationPeriodShouldApply() { - ThreadPoolTaskExecutor executor = this.builder.awaitTerminationPeriod(Duration.ofMinutes(1)).build(); - assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 60); + Duration period = Duration.ofMinutes(1); + ThreadPoolTaskExecutor executor = this.builder.awaitTerminationPeriod(period).build(); + assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationMillis", period.toMillis()); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskSchedulerBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskSchedulerBuilderTests.java index e1363bc5cd..46bb185a10 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskSchedulerBuilderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskSchedulerBuilderTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,8 +54,9 @@ class TaskSchedulerBuilderTests { @Test void awaitTerminationPeriodShouldApply() { - ThreadPoolTaskScheduler executor = this.builder.awaitTerminationPeriod(Duration.ofMinutes(1)).build(); - assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationSeconds", 60); + Duration period = Duration.ofMinutes(1); + ThreadPoolTaskScheduler executor = this.builder.awaitTerminationPeriod(period).build(); + assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationMillis", period.toMillis()); } @Test From 34f33e8b0d196a8da966a437c3193fcacd260da2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 Feb 2020 13:41:35 +0100 Subject: [PATCH 2/6] Start building against Spring HATEOAS 1.0.4 snapshots See gh-20232 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 00d8e4d216..56ac5404f8 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -190,7 +190,7 @@ 2.0.7.RELEASE Moore-SR4 5.2.4.BUILD-SNAPSHOT - 1.0.3.RELEASE + 1.0.4.BUILD-SNAPSHOT 5.2.3.RELEASE 2.3.5.RELEASE 2.3.2.RELEASE From 2095295c4c039f96d01b39c8d0da1edd9072960b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 Feb 2020 13:45:17 +0100 Subject: [PATCH 3/6] Start building against Spring Data Moore SR5 snapshots See gh-20201 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 56ac5404f8..392a64a607 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -188,7 +188,7 @@ 2.2.4.RELEASE 4.2.1.RELEASE 2.0.7.RELEASE - Moore-SR4 + Moore-BUILD-SNAPSHOT 5.2.4.BUILD-SNAPSHOT 1.0.4.BUILD-SNAPSHOT 5.2.3.RELEASE From 942cd85d76e75c9c64ff78e1d180c399e0af3a9b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 Feb 2020 13:46:08 +0100 Subject: [PATCH 4/6] Start building against Spring Integration 5.2.4 snapshots See gh-20202 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 392a64a607..bfdea0faee 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -191,7 +191,7 @@ Moore-BUILD-SNAPSHOT 5.2.4.BUILD-SNAPSHOT 1.0.4.BUILD-SNAPSHOT - 5.2.3.RELEASE + 5.2.4.BUILD-SNAPSHOT 2.3.5.RELEASE 2.3.2.RELEASE 2.0.4.RELEASE From effa2a29f2ac8a71943ff572e6294bf0acbea811 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 Feb 2020 13:46:54 +0100 Subject: [PATCH 5/6] Start building against Spring AMQP 2.2.5 snapshots See gh-20106 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index bfdea0faee..dbb49272e1 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -185,7 +185,7 @@ 1.7.30 1.25 8.2.0 - 2.2.4.RELEASE + 2.2.5.BUILD-SNAPSHOT 4.2.1.RELEASE 2.0.7.RELEASE Moore-BUILD-SNAPSHOT From cc3eac898ab0883e80ea9d971454e534b7972a55 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 20 Feb 2020 13:47:36 +0100 Subject: [PATCH 6/6] Start building against Spring Kafka 2.3.6 snapshots See gh-20203 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index dbb49272e1..3d15e6d682 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -192,7 +192,7 @@ 5.2.4.BUILD-SNAPSHOT 1.0.4.BUILD-SNAPSHOT 5.2.4.BUILD-SNAPSHOT - 2.3.5.RELEASE + 2.3.6.BUILD-SNAPSHOT 2.3.2.RELEASE 2.0.4.RELEASE 1.2.5.RELEASE