Merge pull request #9165 from sampada07/JAVA-913

JAVA-913: migrate parent-boot-1 articles to parent-boot-2

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.

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>

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;
 

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>
 

persistence-modules/flyway/src/main/resources/application.properties

@@ -1 +1 @@
-#flyway.enabled=false
+#spring.flyway.enabled=false