From 1170bd30f191a9e6b93eb7286b0a89ee8f995232 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Wed, 22 Apr 2020 15:42:16 +0530
Subject: [PATCH 1/2] JAVA-921: Migrate mesos-marathon to parent-boot-2

---
 mesos-marathon/README.md                                      | 2 +-
 mesos-marathon/pom.xml                                        | 4 ++--
 .../java/com/baeldung/DemoApplicationIntegrationTest.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mesos-marathon/README.md b/mesos-marathon/README.md
index 65b2361698..8e5b8e4974 100644
--- a/mesos-marathon/README.md
+++ b/mesos-marathon/README.md
@@ -6,4 +6,4 @@ This module contains articles about Marathon and Mesos.
 
 - [Simple Jenkins Pipeline with Marathon and Mesos](https://www.baeldung.com/jenkins-pipeline-with-marathon-mesos)
 
-    To run the pipeline, please modify the dockerise.sh file with your own useranema and password for docker login.
+    To run the pipeline, please modify the dockerise.sh file with your own username and password for docker login.
diff --git a/mesos-marathon/pom.xml b/mesos-marathon/pom.xml
index 4fb819c434..42798bb209 100644
--- a/mesos-marathon/pom.xml
+++ b/mesos-marathon/pom.xml
@@ -7,9 +7,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/mesos-marathon/src/test/java/com/baeldung/DemoApplicationIntegrationTest.java b/mesos-marathon/src/test/java/com/baeldung/DemoApplicationIntegrationTest.java
index 85331516f9..dfe944a316 100644
--- a/mesos-marathon/src/test/java/com/baeldung/DemoApplicationIntegrationTest.java
+++ b/mesos-marathon/src/test/java/com/baeldung/DemoApplicationIntegrationTest.java
@@ -3,8 +3,8 @@ package com.baeldung;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.client.RestTemplate;
 

From e7804ee7169c2069e1ac14c89b38dfc487f49fe7 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Wed, 22 Apr 2020 17:44:28 +0530
Subject: [PATCH 2/2] JAVA-922: Migrate flyway to parent-boot-2

---
 persistence-modules/flyway/pom.xml                          | 6 +++---
 .../flyway/src/main/resources/application.properties        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/persistence-modules/flyway/pom.xml b/persistence-modules/flyway/pom.xml
index 01b3dab6ee..f2e393abbf 100644
--- a/persistence-modules/flyway/pom.xml
+++ b/persistence-modules/flyway/pom.xml
@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -63,7 +63,7 @@
     </build>
 
     <properties>
-        <flyway-core.version>5.0.2</flyway-core.version>
+        <flyway-core.version>5.2.3</flyway-core.version>
         <flyway-maven-plugin.version>5.0.2</flyway-maven-plugin.version>
     </properties>
 
diff --git a/persistence-modules/flyway/src/main/resources/application.properties b/persistence-modules/flyway/src/main/resources/application.properties
index 4d339eca5c..cee75fa4d9 100644
--- a/persistence-modules/flyway/src/main/resources/application.properties
+++ b/persistence-modules/flyway/src/main/resources/application.properties
@@ -1 +1 @@
-#flyway.enabled=false
\ No newline at end of file
+#spring.flyway.enabled=false
\ No newline at end of file