-
-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix snapshot checking with up-to-date project info - closes #345
- Loading branch information
1 parent
004c156
commit 7f9146b
Showing
8 changed files
with
139 additions
and
16 deletions.
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
src/it/release-start-it-projects-reloading/child1/child1-pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<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/maven-v4_0_0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<groupId>com.amashchenko.maven.plugin</groupId> | ||
<artifactId>gitflow-maven-test-child1</artifactId> | ||
<packaging>pom</packaging> | ||
<version>0.0.1</version> | ||
</project> |
10 changes: 10 additions & 0 deletions
10
src/it/release-start-it-projects-reloading/expected-pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<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/maven-v4_0_0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<groupId>com.amashchenko.maven.plugin</groupId> | ||
<artifactId>gitflow-maven-test</artifactId> | ||
<packaging>pom</packaging> | ||
<version>0.0.1</version> | ||
<!-- <modules> | ||
<module>child1</module> | ||
</modules>--> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
build.log | ||
expected-pom.xml | ||
invoker.properties | ||
init.bsh | ||
verify.bsh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
import org.codehaus.plexus.util.FileUtils; | ||
|
||
try { | ||
new File(basedir, "gitignorefile").renameTo(new File(basedir, ".gitignore")); | ||
|
||
Process p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " init"); | ||
p.waitFor(); | ||
|
||
Process p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " config user.email 'a@a.aa'"); | ||
p.waitFor(); | ||
Process p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " config user.name 'a'"); | ||
p.waitFor(); | ||
|
||
p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " add ."); | ||
p.waitFor(); | ||
|
||
p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " commit -m init"); | ||
p.waitFor(); | ||
|
||
p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " branch develop"); | ||
p.waitFor(); | ||
|
||
p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " checkout master"); | ||
p.waitFor(); | ||
|
||
new File(basedir, "child1/child1-pom.xml").renameTo(new File(basedir, "child1/pom.xml")); | ||
|
||
File pomfile = new File(basedir, "pom.xml"); | ||
String pomfilestr = FileUtils.fileRead(pomfile, "UTF-8"); | ||
pomfilestr = pomfilestr.replace("<!--", ""); | ||
pomfilestr = pomfilestr.replace("-->", ""); | ||
FileUtils.fileWrite(basedir + "/pom.xml", "UTF-8", pomfilestr); | ||
|
||
p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " add ."); | ||
p.waitFor(); | ||
|
||
p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " commit -m add_child_module"); | ||
p.waitFor(); | ||
|
||
} catch (Exception e) { | ||
e.printStackTrace(); | ||
return false; | ||
} | ||
return true; |
3 changes: 3 additions & 0 deletions
3
src/it/release-start-it-projects-reloading/invoker.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:release-start -B | ||
|
||
invoker.description=Test projects reloading when new module added in not checkouted branch (https://github.com/aleksandr-m/gitflow-maven-plugin/issues/345). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<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/maven-v4_0_0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<groupId>com.amashchenko.maven.plugin</groupId> | ||
<artifactId>gitflow-maven-test</artifactId> | ||
<packaging>pom</packaging> | ||
<version>0.0.1-SNAPSHOT</version> | ||
<!-- <modules> | ||
<module>child1</module> | ||
</modules>--> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import org.codehaus.plexus.util.FileUtils; | ||
|
||
try { | ||
File gitRef = new File(basedir, ".git/refs/heads/release/0.0.1"); | ||
if (!gitRef.exists()) { | ||
System.out.println("release-start .git/refs/heads/release/0.0.1 doesn't exist"); | ||
return false; | ||
} | ||
|
||
File file = new File(basedir, "pom.xml"); | ||
File expectedFile = new File(basedir, "expected-pom.xml"); | ||
|
||
String actual = FileUtils.fileRead(file, "UTF-8"); | ||
String expected = FileUtils.fileRead(expectedFile, "UTF-8"); | ||
|
||
actual = actual.replaceAll("\\r?\\n", ""); | ||
expected = expected.replaceAll("\\r?\\n", ""); | ||
|
||
if (!expected.equals(actual)) { | ||
System.out.println("release-start expected: " + expected + " actual was:" + actual); | ||
return false; | ||
} | ||
} catch (Exception e) { | ||
e.printStackTrace(); | ||
return false; | ||
} | ||
return true; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters