SONAR-1815: Fix packaging of dependencies when groupId=org.codehaus.sonar

diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/SonarPluginMojo.java b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/SonarPluginMojo.java
index 2caa56b4582efc9650446de86c57d16bc626ce49..a8be99640fe4afea3c22f98a70d9d9df6b07b53e 100644 (file)
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/SonarPluginMojo.java
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/SonarPluginMojo.java
@@ -306,7 +306,10 @@ public class SonarPluginMojo extends AbstractSonarPluginMojo {
 
   private void searchForSonarProvidedArtifacts(DependencyNode dependency, Set<Artifact> sonarArtifacts, boolean isProvidedBySonar) {
     if (dependency != null) {
-      isProvidedBySonar = isProvidedBySonar || ("org.codehaus.sonar".equals(dependency.getArtifact().getGroupId()) && !Artifact.SCOPE_TEST.equals(dependency.getArtifact().getScope()));
+      // skip check on root node - see SONAR-1815
+      if (dependency.getParent() != null) {
+        isProvidedBySonar = isProvidedBySonar || ("org.codehaus.sonar".equals(dependency.getArtifact().getGroupId()) && !Artifact.SCOPE_TEST.equals(dependency.getArtifact().getScope()));
+      }
 
       if (isProvidedBySonar) {
         sonarArtifacts.add(dependency.getArtifact());