From: Godin <mandrikov@gmail.com>
Date: Mon, 27 Sep 2010 15:27:44 +0000 (+0000)
Subject: SONAR-1815: Fix packaging of dependencies when groupId=org.codehaus.sonar
X-Git-Tag: 2.6~933
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4fdde0e6906ec693fbbd02bf2fcc818e4277ad0a;p=sonarqube.git

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 2caa56b4582..a8be99640fe 100644
--- 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());