Skip to content

Commit b1e7155

Browse files
wilkinsonawilkinsona
committed
Adapt to restructuring changes in Spring Boot 4.0
This commit updates imports and dependencies to adapt to Spring Boot 4.0's restructuring. This commit also stops using some APIs that have been deprecated since Spring Boot 3.4. Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
1 parent c9ed2d6 commit b1e7155

44 files changed

Lines changed: 157 additions & 125 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/modules/ROOT/partials/_configprops.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
|===
22
|Name | Default | Description
33

4-
|spring.cloud.task.batch.application-runner-order | `+++0+++` | The order for the {@code ApplicationRunner} used to run batch jobs when {@code spring.cloud.task.batch.fail-on-job-failure=true}. Defaults to 0 (same as the {@link org.springframework.boot.autoconfigure.batch.JobLauncherApplicationRunner}).
4+
|spring.cloud.task.batch.application-runner-order | `+++0+++` | The order for the {@code ApplicationRunner} used to run batch jobs when {@code spring.cloud.task.batch.fail-on-job-failure=true}. Defaults to 0 (same as the {@link org.springframework.boot.batch.autoconfigure.JobLauncherApplicationRunner}).
55
|spring.cloud.task.batch.command-line-runner-order | |
66
|spring.cloud.task.batch.events.chunk-event-binding-name | `+++chunk-events+++` |
77
|spring.cloud.task.batch.events.chunk-order | | Establishes the default {@link Ordered} precedence for {@link org.springframework.batch.core.ChunkListener}.

‎spring-cloud-starter-single-step-batch-job/pom.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<groupId>org.springframework.cloud</groupId>
1919
<artifactId>spring-cloud-task-core</artifactId>
2020
</dependency>
21+
<dependency>
22+
<groupId>org.springframework.boot</groupId>
23+
<artifactId>spring-boot-jdbc</artifactId>
24+
</dependency>
2125
<dependency>
2226
<groupId>org.springframework.boot</groupId>
2327
<artifactId>spring-boot-starter-batch</artifactId>
@@ -53,8 +57,8 @@
5357
<scope>test</scope>
5458
</dependency>
5559
<dependency>
56-
<groupId>org.springframework.amqp</groupId>
57-
<artifactId>spring-amqp</artifactId>
60+
<groupId>org.springframework.boot</groupId>
61+
<artifactId>spring-boot-amqp</artifactId>
5862
<optional>true</optional>
5963
</dependency>
6064
<dependency>
@@ -73,7 +77,7 @@
7377
</dependency>
7478
<dependency>
7579
<groupId>com.fasterxml.jackson.core</groupId>
76-
<artifactId>jackson-core</artifactId>
80+
<artifactId>jackson-databind</artifactId>
7781
</dependency>
7882
<dependency>
7983
<groupId>com.fasterxml.jackson.core</groupId>
@@ -100,8 +104,8 @@
100104
<scope>test</scope>
101105
</dependency>
102106
<dependency>
103-
<groupId>org.springframework.kafka</groupId>
104-
<artifactId>spring-kafka</artifactId>
107+
<groupId>org.springframework.boot</groupId>
108+
<artifactId>spring-boot-kafka</artifactId>
105109
</dependency>
106110
<dependency>
107111
<groupId>org.junit.jupiter</groupId>

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2020 the original author or authors.
2+
* Copyright 2019-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@
3030
import org.springframework.beans.factory.annotation.Autowired;
3131
import org.springframework.boot.autoconfigure.AutoConfiguration;
3232
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
33-
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3433
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3534
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
35+
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
3636
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3737
import org.springframework.context.ApplicationContext;
3838
import org.springframework.context.annotation.Bean;

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2021 the original author or authors.
2+
* Copyright 2019-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@
3333
import org.springframework.beans.factory.annotation.Autowired;
3434
import org.springframework.boot.autoconfigure.AutoConfiguration;
3535
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
36-
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3736
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3837
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
38+
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
3939
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4040
import org.springframework.cloud.task.batch.autoconfigure.RangeConverter;
4141
import org.springframework.context.annotation.Bean;

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2020 the original author or authors.
2+
* Copyright 2019-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,9 +29,9 @@
2929
import org.springframework.beans.factory.annotation.Autowired;
3030
import org.springframework.boot.autoconfigure.AutoConfiguration;
3131
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
32-
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3332
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3433
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
34+
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
3535
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3636
import org.springframework.context.annotation.Bean;
3737
import org.springframework.core.io.WritableResource;

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JDBCSingleStepDataSourceAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2022 the original author or authors.
2+
* Copyright 2022-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
2121
import org.springframework.beans.factory.annotation.Qualifier;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
24-
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
2524
import org.springframework.boot.context.properties.ConfigurationProperties;
25+
import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
2626
import org.springframework.cloud.task.configuration.DefaultTaskConfigurer;
2727
import org.springframework.cloud.task.configuration.TaskConfigurer;
2828
import org.springframework.context.annotation.Bean;

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2022 the original author or authors.
2+
* Copyright 2020-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,12 +31,12 @@
3131
import org.springframework.beans.factory.annotation.Qualifier;
3232
import org.springframework.boot.autoconfigure.AutoConfiguration;
3333
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
34-
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3534
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3635
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
37-
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
36+
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
3837
import org.springframework.boot.context.properties.ConfigurationProperties;
3938
import org.springframework.boot.context.properties.EnableConfigurationProperties;
39+
import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
4040
import org.springframework.context.ApplicationContext;
4141
import org.springframework.context.annotation.Bean;
4242
import org.springframework.context.annotation.Import;

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2022 the original author or authors.
2+
* Copyright 2020-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,12 +32,12 @@
3232
import org.springframework.beans.factory.annotation.Qualifier;
3333
import org.springframework.boot.autoconfigure.AutoConfiguration;
3434
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
35-
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3635
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3736
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
38-
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
37+
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
3938
import org.springframework.boot.context.properties.ConfigurationProperties;
4039
import org.springframework.boot.context.properties.EnableConfigurationProperties;
40+
import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
4141
import org.springframework.context.ApplicationContext;
4242
import org.springframework.context.annotation.Bean;
4343
import org.springframework.context.annotation.Import;

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2023 the original author or authors.
2+
* Copyright 2020-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.boot.autoconfigure.AutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29-
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
32-
import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
31+
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
3332
import org.springframework.boot.context.properties.EnableConfigurationProperties;
33+
import org.springframework.boot.kafka.autoconfigure.KafkaProperties;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.util.StringUtils;
3636

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2023 the original author or authors.
2+
* Copyright 2020-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@
2525
import org.springframework.beans.factory.annotation.Qualifier;
2626
import org.springframework.boot.autoconfigure.AutoConfiguration;
2727
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
28-
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
31-
import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
30+
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
3231
import org.springframework.boot.context.properties.EnableConfigurationProperties;
32+
import org.springframework.boot.kafka.autoconfigure.KafkaProperties;
3333
import org.springframework.context.annotation.Bean;
3434
import org.springframework.core.convert.converter.Converter;
3535
import org.springframework.kafka.core.DefaultKafkaProducerFactory;

0 commit comments

Comments
 (0)