iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9165 from sampada07/JAVA-913

Browse Source 
JAVA-913: migrate parent-boot-1 articles to parent-boot-2
This commit is contained in:
Dhawal Kapil 2020-04-22 20:16:56 +05:30 committed by GitHub
commit a5d8f4d54e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesos-marathon/README.md
View File

@ -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.

4
mesos-marathon/pom.xml
View File

@ -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>

2
mesos-marathon/src/test/java/com/baeldung/DemoApplicationIntegrationTest.java
View File

@ -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;

6
persistence-modules/flyway/pom.xml
View File

@ -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>

2
persistence-modules/flyway/src/main/resources/application.properties
View File

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