update spring and java version + restructure

Author: code-not-found

spring-batch-admin/spring-cloud-data-flow-server/bin/src/main/java/com/codenotfound/SpringDataFlowServerApplication.class

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,28 +16,26 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.17.RELEASE</version>
+    <version>2.1.5.RELEASE</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
-
-    <spring-cloud-dataflow.version>1.7.1.RELEASE</spring-cloud-dataflow.version>
-    <hibernate.version>5.3.7.Final</hibernate.version>
+    <java.version>11</java.version>
+    <spring-cloud-starter-dataflow-server.version>2.1.0.RELEASE</spring-cloud-starter-dataflow-server.version>
+    <h2.version>1.4.193</h2.version>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-dataflow-server</artifactId>
+      <version>${spring-cloud-starter-dataflow-server.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-dataflow-server-local</artifactId>
-      <version>${spring-cloud-dataflow.version}</version>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>${h2.version}</version>
     </dependency>
   </dependencies>
 

spring-batch-admin/spring-cloud-data-flow-server/pom.xml

@@ -1,14 +1,17 @@
-package com.codenotfound.batch;
+package com.codenotfound;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.dataflow.server.EnableDataFlowServer;
+import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration;
 
 @EnableDataFlowServer
-@SpringBootApplication
+@SpringBootApplication(
+    exclude = {CloudFoundryDeployerAutoConfiguration.class})
 public class SpringDataFlowServerApplication {
 
   public static void main(String[] args) {
-    SpringApplication.run(SpringDataFlowServerApplication.class, args);
+    SpringApplication.run(SpringDataFlowServerApplication.class,
+        args);
   }
 }