diff --git a/spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 846202f3..00000000 --- a/spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,11 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderAutoConfiguration,\ - org.springframework.cloud.task.batch.autoconfigure.RangeConverter,\ - org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration,\ - org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterAutoConfiguration, \ - org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcBatchItemWriterAutoConfiguration, \ - org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcCursorItemReaderAutoConfiguration, \ - org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemReaderAutoConfiguration, \ - org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterAutoConfiguration, \ - org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemReaderAutoConfiguration, \ - org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemWriterAutoConfiguration - diff --git a/spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..a645bddb --- /dev/null +++ b/spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,11 @@ +org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.RangeConverter +org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcBatchItemWriterAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcCursorItemReaderAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemReaderAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemReaderAutoConfiguration +org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemWriterAutoConfiguration + diff --git a/spring-cloud-task-batch/src/main/resources/META-INF/spring.factories b/spring-cloud-task-batch/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 3db9c9fe..00000000 --- a/spring-cloud-task-batch/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration,org.springframework.cloud.task.batch.configuration.TaskJobLauncherAutoConfiguration diff --git a/spring-cloud-task-batch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-task-batch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..66fb7f99 --- /dev/null +++ b/spring-cloud-task-batch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration +org.springframework.cloud.task.batch.configuration.TaskJobLauncherAutoConfiguration diff --git a/spring-cloud-task-batch/src/test/resources/META-INF/spring.factories b/spring-cloud-task-batch/src/test/resources/META-INF/spring/org.springframework.cloud.task.batch.configuration.TaskBatchTest.imports similarity index 72% rename from spring-cloud-task-batch/src/test/resources/META-INF/spring.factories rename to spring-cloud-task-batch/src/test/resources/META-INF/spring/org.springframework.cloud.task.batch.configuration.TaskBatchTest.imports index ddec7ef9..75fab251 100644 --- a/spring-cloud-task-batch/src/test/resources/META-INF/spring.factories +++ b/spring-cloud-task-batch/src/test/resources/META-INF/spring/org.springframework.cloud.task.batch.configuration.TaskBatchTest.imports @@ -1,6 +1,5 @@ -org.springframework.cloud.task.batch.configuration.TaskBatchTest=\ -org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration,\ -org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration,\ -org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration,\ -org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration,\ +org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration +org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration +org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration +org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration org.springframework.cloud.task.configuration.SingleTaskConfiguration diff --git a/spring-cloud-task-core/src/main/resources/META-INF/spring.factories b/spring-cloud-task-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 72% rename from spring-cloud-task-core/src/main/resources/META-INF/spring.factories rename to spring-cloud-task-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e52455f6..3196ed99 100644 --- a/spring-cloud-task-core/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-task-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,3 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.task.configuration.SingleTaskConfiguration,\ -org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration,\ +org.springframework.cloud.task.configuration.SingleTaskConfiguration +org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration org.springframework.cloud.task.configuration.observation.ObservationTaskAutoConfiguration diff --git a/spring-cloud-task-stream/src/main/resources/META-INF/spring.factories b/spring-cloud-task-stream/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 66% rename from spring-cloud-task-stream/src/main/resources/META-INF/spring.factories rename to spring-cloud-task-stream/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4c0342f3..fa80fe77 100644 --- a/spring-cloud-task-stream/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-task-stream/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.task.listener.TaskEventAutoConfiguration,\ +org.springframework.cloud.task.listener.TaskEventAutoConfiguration org.springframework.cloud.task.batch.listener.BatchEventAutoConfiguration