SONAR-1587 Fix inter module dependencies when sonar.branch is used

2 files changed, 12 insertions, 2 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Library.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Library.java
index 785937126fc..da5cc35681b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Library.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Library.java
@@ -87,6 +87,10 @@ public final class Library extends Resource {
     return false;
   }
 
+  public static Library createFromMavenIds(String groupId, String artifactId, String version) {
+    return new Library(String.format(Project.MAVEN_KEY_FORMAT, groupId, artifactId), version);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
index 4355838c9e8..64be7f80a54 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
@@ -28,6 +28,8 @@ import org.apache.maven.project.MavenProject;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.component.Component;
 
+import javax.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -49,7 +51,7 @@ public class Project extends Resource implements Component {
     }
   };
 
-  private static final String MAVEN_KEY_FORMAT = "%s:%s";
+  static final String MAVEN_KEY_FORMAT = "%s:%s";
   private static final String BRANCH_KEY_FORMAT = "%s:%s";
 
   public static final String SCOPE = Scopes.PROJECT;
@@ -481,7 +483,11 @@ public class Project extends Resource implements Component {
   }
 
   public static Project createFromMavenIds(String groupId, String artifactId) {
-    return new Project(String.format(MAVEN_KEY_FORMAT, groupId, artifactId));
+    return createFromMavenIds(groupId, artifactId, null);
+  }
+
+  public static Project createFromMavenIds(String groupId, String artifactId, @Nullable String branch) {
+    return new Project(String.format(MAVEN_KEY_FORMAT, groupId, artifactId), branch, "");
   }
 
   @Override