Added additional metadata filters for single step job app

The original pass only included the  properties for the readers and writers, not the suppporting spring props
resolves #4654

Author: cppwfs

spring-cloud-dataflow-single-step-batch-job/pom.xml

@@ -107,6 +107,21 @@
 							<filter>org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemWriterProperties</filter>
 							<filter>org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemReaderProperties</filter>
 							<filter>org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterProperties</filter>
+							<filter>org.springframework.boot.autoconfigure.amqp.RabbitProperties</filter>
+							<filter>org.springframework.boot.autoconfigure.amqp.RabbitProperties$Template</filter>
+							<filter>org.springframework.boot.autoconfigure.amqp.RabbitProperties$Retry</filter>
+							<filter>org.springframework.boot.autoconfigure.amqp.RabbitProperties$ListenerRetry</filter>
+							<filter>org.springframework.cloud.task.configuration.TaskProperties</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Consumer</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Producer</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Template</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Listener</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Ssl</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Jaas</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Security</filter>
+							<filter>org.springframework.boot.autoconfigure.kafka.KafkaProperties$Cleanup</filter>
+							<filter>org.springframework.boot.autoconfigure.jdbc.DataSourceProperties</filter>
+							<filter>org.springframework.boot.autoconfigure.jdbc.DataSourceProperties$Xa</filter>
 						</sourceTypes>
 					</metadataFilter>
 				</configuration>

spring-cloud-dataflow-single-step-batch-job/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties

@@ -7,4 +7,19 @@ configuration-properties.classes=org.springframework.cloud.task.batch.autoconfig
   org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemReaderProperties, \
   org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemWriterProperties, \
   org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemReaderProperties, \
-  org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterProperties
+  org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterProperties, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$Template, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$Retry, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$ListenerRetry, \
+  org.springframework.cloud.task.configuration.TaskProperties, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Consumer, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Producer, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Template, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Listener, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Ssl, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Jaas, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Security, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Cleanup, \
+  org.springframework.boot.autoconfigure.jdbc.DataSourceProperties, \
+  org.springframework.boot.autoconfigure.jdbc.DataSourceProperties$Xa

spring-cloud-dataflow-single-step-batch-job/src/main/resources/META-INF/dataflow-configuration-metadata.properties

@@ -7,4 +7,19 @@ configuration-properties.classes=org.springframework.cloud.task.batch.autoconfig
   org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemReaderProperties, \
   org.springframework.cloud.task.batch.autoconfigure.kafka.KafkaItemWriterProperties, \
   org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemReaderProperties, \
-  org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterProperties
+  org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterProperties, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$Template, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$Retry, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$ListenerRetry, \
+  org.springframework.cloud.task.configuration.TaskProperties, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Consumer, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Producer, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Template, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Listener, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Ssl, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Jaas, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Security, \
+  org.springframework.boot.autoconfigure.kafka.KafkaProperties$Cleanup, \
+  org.springframework.boot.autoconfigure.jdbc.DataSourceProperties, \
+  org.springframework.boot.autoconfigure.jdbc.DataSourceProperties$Xa