Updated v1.1 with conflicts.

Author: renatoathaydes

Diff for: fourth-app/src/main/java/com/fourthcompany/app/Fourth.java

@@ -2,4 +2,10 @@
 
 public class Fourth {
     public String getMessage() { return "hello"; }
+
+    // new in 1.1 (semver OK)
+    public String getMessage(boolean arriving) {
+        return arriving ? "hello" : "bye";
+    }
+
 }

Diff for: my-app/pom.xml

@@ -24,6 +24,11 @@
       <artifactId>other-app</artifactId>
       <version>1.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.fourthcompany.app</groupId>
+      <artifactId>fourth-app</artifactId>
+      <version>1.0</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Diff for: my-app/src/main/java/com/mycompany/app/App.java

@@ -1,9 +1,14 @@
 package com.mycompany.app;
 import com.othercompany.app.Second;
+import com.fourthcompany.app.Fourth;
 
 public class App {
     public static void main(String... args) {
         String message = new Second().wrapMessageIn("|");
+        // dev decided to use fourth v1.0 directly, but
+        // upgraded to third 1.1, failing to notice it requires fourth 1.1
+        message += new Fourth().getMessage();
         System.out.println(message);
+
     }
 }

Diff for: third-app/src/main/java/com/thirdcompany/app/Third.java

@@ -3,6 +3,7 @@
 
 public class Third {
     public String upperCaseMessage() {
-        return new Fourth().getMessage().toUpperCase();
+        // the dev decided to use the new method from v1.1!
+        return new Fourth().getMessage(true).toUpperCase();
     }
 }