fix file-merge didn't work correct

cecom · Nov 12, 2014 · 35ac789 · 35ac789
1 parent 99c6cd4
commit 35ac789
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.oppermann.pomutils</groupId>
     <artifactId>pomutils</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
 
     <licenses>
         <license>

diff --git a/src/main/java/de/oppermann/pomutils/PomMergeDriver.java b/src/main/java/de/oppermann/pomutils/PomMergeDriver.java
@@ -55,7 +55,7 @@ public void adjustTheirPomVersion() {
 	}
 
 	public int doGitMerge() {
-		ProcessBuilder processBuilder = new ProcessBuilder("git", "merge-file", "-p", "-L", "our", "-L", "base", "-L", "theirs", ourPom.getPath(),
+		ProcessBuilder processBuilder = new ProcessBuilder("git", "merge-file", "-L", "our", "-L", "base", "-L", "theirs", ourPom.getPath(),
 		        basePom.getPath(), theirPom.getPath());
 		processBuilder.redirectErrorStream(true);
 		try {

diff --git a/src/test/java/de/oppermann/pomutils/PomMergeDriverTest.java b/src/test/java/de/oppermann/pomutils/PomMergeDriverTest.java
@@ -24,6 +24,7 @@
 import junit.framework.TestCase;
 
 import org.apache.commons.io.FileUtils;
+import org.codehaus.mojo.versions.api.PomHelper;
 
 import de.oppermann.pomutils.util.POM;
 
@@ -55,11 +56,17 @@ public void testAutoMergeSucceded() throws Exception {
 		int mergeReturnValue = pomMergeDriver.doGitMerge();
 
 		assertTrue("merge succeeded", mergeReturnValue == 0);
-
+		
 		POM theirPom = new POM(theirPomFile);
 		POM ourPom = new POM(ourPomFile);
 
 		assertEquals("same version now", ourPom.getProjectVersion(), theirPom.getProjectVersion());
+
+
+		String theirDependecyVersoin = PomHelper.getRawModel(new File(theirPomFile)).getDependencies().get(0).getVersion();
+		String ourDependencyVersion = PomHelper.getRawModel(new File(ourPomFile)).getDependencies().get(0).getVersion();
+
+		assertEquals("dependency version change merged", theirDependecyVersoin, ourDependencyVersion);
 	}
 
 	public void testAutoMergeFailed() throws Exception {

diff --git a/src/test/resources/merge/autoMergeSucceded/our.pom.xml b/src/test/resources/merge/autoMergeSucceded/our.pom.xml
@@ -7,7 +7,7 @@
   	<dependency>
   		<groupId>org.codehaus.mojo</groupId>
   		<artifactId>versions-maven-plugin</artifactId>
-  		<version>2.5</version>
+  		<version>2.1</version>
   		<type>maven-plugin</type>
   	</dependency>
   </dependencies>

diff --git a/src/test/resources/merge/autoMergeSucceded/their.pom.xml b/src/test/resources/merge/autoMergeSucceded/their.pom.xml
@@ -7,7 +7,7 @@
   	<dependency>
   		<groupId>org.codehaus.mojo</groupId>
   		<artifactId>versions-maven-plugin</artifactId>
-  		<version>2.1</version>
+  		<version>2.5</version>
   		<type>maven-plugin</type>
   	</dependency>
   </dependencies>