diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 5173f3b..1c820b4 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -30,7 +30,7 @@ - 1.0.1.BUILD-SNAPSHOT + 1.0.2.BUILD-SNAPSHOT 1.0.3.BUILD-SNAPSHOT diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index fcf4e93..bb493c3 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml @@ -31,19 +31,7 @@ org.springframework.cloud - spring-cloud-task-batch - - - org.springframework.cloud - spring-cloud-deployer-local - - - org.springframework.cloud - spring-cloud-dataflow-server-core - - - org.springframework.cloud - spring-cloud-dataflow-server-core + spring-cloud-starter-dataflow-server-local org.springframework.boot diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java index 37984d3..eb3616c 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java @@ -16,17 +16,10 @@ package org.springframework.cloud.launcher.dataflow; -import javax.sql.DataSource; - -import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.batch.BatchDatabaseInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.dataflow.server.EnableDataFlowServer; -import org.springframework.cloud.task.repository.support.TaskRepositoryInitializer; -import org.springframework.context.annotation.Bean; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; /** * @author Spencer Gibb @@ -35,36 +28,9 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; @EnableDiscoveryClient @SpringBootApplication public class DataFlowApplication { + public static void main(String[] args) { SpringApplication.run(DataFlowApplication.class, args); } - @Bean - public JobRepositoryFactoryBean jobRepositoryFactoryBeanForServer( - DataSource dataSource, - DataSourceTransactionManager dataSourceTransactionManager) { - JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); - repositoryFactoryBean.setDataSource(dataSource); - repositoryFactoryBean.setTransactionManager(dataSourceTransactionManager); - return repositoryFactoryBean; - } - - @Bean - public DataSourceTransactionManager transactionManagerForServer( - DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } - - @Bean - public BatchDatabaseInitializer batchRepositoryInitializerForDefaultDBForServer() { - return new BatchDatabaseInitializer(); - } - - @Bean - public TaskRepositoryInitializer taskRepositoryInitializerForDefaultDB( - DataSource dataSource) { - TaskRepositoryInitializer taskRepositoryInitializer = new TaskRepositoryInitializer(); - taskRepositoryInitializer.setDataSource(dataSource); - return taskRepositoryInitializer; - } } diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/resources/application.yml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/resources/application.yml index 3fe5331..d61aaf9 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/resources/application.yml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: eureka: instance: - status-page-url-path: /admin-ui #allows you to click on the link in eureka dashboard + status-page-url-path: /dashboard #allows you to click on the link in eureka dashboard info: artifactId: "@project.artifactId@" @@ -17,4 +17,4 @@ security: management: context-path: /admin security: - enabled: false \ No newline at end of file + enabled: false