Fix publication

18 files changed, 80 insertions, 143 deletions

diff --git a/build.gradle b/build.gradle
index 361a5609158..6b4311b54fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,79 +40,6 @@ allprojects {
   ext {
     release = project.hasProperty('release') && project.getProperty('release')
     official = project.hasProperty('official') && project.getProperty('official')
-    pomConfig = {
-      name projectTitle
-      description description
-      url 'http://www.sonarqube.org/'
-      organization {
-        name 'SonarSource'
-        url 'http://www.sonarsource.com'
-      }
-      licenses {
-        license {
-          name 'GNU LGPL 3'
-          url 'http://www.gnu.org/licenses/lgpl.txt'
-          distribution 'repo'
-        }
-      }
-      scm {
-        url 'https://github.com/SonarSource/sonarqube'
-      }
-      developers {
-        developer {
-          id 'bellingard'
-          name 'Fabrice Bellingard'
-        }
-        developer {
-          id 'dbolkensteyn'
-          name 'Dinesh Bolkensteyn'
-        }
-        developer {
-          id 'ehartmann'
-          name 'Eric Hartmann'
-        }
-        developer {
-          id 'fmallet'
-          name 'Freddy Mallet'
-        }
-        developer {
-          id 'Godin'
-          name 'Evgeny Mandrikov'
-        }
-        developer {
-          id 'henryju'
-          name 'Julien Henry'
-        }
-        developer {
-          id 'jblievremont'
-          name 'Jean-Baptiste Lievremont'
-        }
-        developer {
-          id 'julienlancelot'
-          name 'Julien Lancelot'
-        }
-        developer {
-          id 'olivier.gaudin'
-          name 'Olivier Gaudin'
-        }
-        developer {
-          id 'simonbrandhof'
-          name 'Simon Brandhof'
-        }
-        developer {
-          id 'sns-seb'
-          name 'Sebastien Lesaint'
-        }
-        developer {
-          id 'stas-vilchik'
-          name 'Stas Vilchik'
-        }
-        developer {
-          id 'teryk'
-          name 'Teryk Bellahsene'
-        }
-      }
-    }
   }
 
   repositories {
@@ -366,6 +293,86 @@ subprojects {
     }
     excludes(["**/*.txt", "**/*.properties", "**/*.xml", "**/*.xsd", "**/*.html", "**/*.json", "**/*.sql", "**/*.rb", "**/*.vm"])
   }
+
+  publishing {
+    publications {
+      mavenJava(MavenPublication) {
+        if (release) {
+          pom.withXml {
+            asNode().appendNode('name', projectTitle)
+            asNode().appendNode('description', description)
+            asNode().appendNode('url', 'http://www.sonarqube.org/')
+            
+            def organization = asNode().appendNode('organization')
+            organization.appendNode('name', 'SonarSource')
+            organization.appendNode('url', 'http://www.sonarsource.com')
+
+            def licenses = asNode().appendNode('licenses')
+            def license = licenses.appendNode('license')
+            license.appendNode('name', 'GNU LGPL 3')
+            license.appendNode('url', 'http://www.gnu.org/licenses/lgpl.txt')
+            license.appendNode('distribution', 'repo')
+
+            def scm = asNode().appendNode('scm')
+            scm.appendNode('url', 'https://github.com/SonarSource/sonarqube')
+
+            def developers = asNode().appendNode('developers')
+            def developer = developers.appendNode('developer')
+            developer.appendNode('id', 'bellingard')
+            developer.appendNode('name', 'Fabrice Bellingard')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'dbolkensteyn')
+            developer.appendNode('name', 'Dinesh Bolkensteyn')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'ehartmann')
+            developer.appendNode('name', 'Eric Hartmann')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'fmallet')
+            developer.appendNode('name', 'Freddy Mallet')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'Godin')
+            developer.appendNode('name', 'Evgeny Mandrikov')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'henryju')
+            developer.appendNode('name', 'Julien Henry')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'jblievremont')
+            developer.appendNode('name', 'Jean-Baptiste Lievremont')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'julienlancelot')
+            developer.appendNode('name', 'Julien Lancelot')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'olivier.gaudin')
+            developer.appendNode('name', 'Olivier Gaudin')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'simonbrandhof')
+            developer.appendNode('name', 'Simon Brandhof')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'sns-seb')
+            developer.appendNode('name', 'Sebastien Lesaint')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'stas-vilchik')
+            developer.appendNode('name', 'Stas Vilchik')
+
+            developer = developers.appendNode('developer')
+            developer.appendNode('id', 'teryk')
+            developer.appendNode('name', 'Teryk Bellahsene')
+          }
+        }
+      }
+    }
+  }
 }
 
 artifactory {
diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle
index df7a0be86c4..66c6d051b68 100644
--- a/plugins/sonar-xoo-plugin/build.gradle
+++ b/plugins/sonar-xoo-plugin/build.gradle
@@ -41,10 +41,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle
index 2548fbabbda..df83a0aeaac 100644
--- a/server/sonar-db-core/build.gradle
+++ b/server/sonar-db-core/build.gradle
@@ -80,10 +80,6 @@ publishing {
         artifact sourcesJar
         artifact javadocJar
         artifact testJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle
index b0b2503f626..f7103bceaae 100644
--- a/server/sonar-db-dao/build.gradle
+++ b/server/sonar-db-dao/build.gradle
@@ -59,10 +59,6 @@ publishing {
         artifact sourcesJar
         artifact javadocJar
         artifact testJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/server/sonar-db-migration/build.gradle b/server/sonar-db-migration/build.gradle
index b9adeee09cc..7360daec774 100644
--- a/server/sonar-db-migration/build.gradle
+++ b/server/sonar-db-migration/build.gradle
@@ -42,10 +42,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/server/sonar-plugin-bridge/build.gradle b/server/sonar-plugin-bridge/build.gradle
index 0ca7127f75d..d1fdaf049e8 100644
--- a/server/sonar-plugin-bridge/build.gradle
+++ b/server/sonar-plugin-bridge/build.gradle
@@ -23,10 +23,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index 61a839aa320..862d121f001 100644
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -38,10 +38,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/server/sonar-qa-util/build.gradle b/server/sonar-qa-util/build.gradle
index 2b65d26cbf6..da6634f460c 100644
--- a/server/sonar-qa-util/build.gradle
+++ b/server/sonar-qa-util/build.gradle
@@ -25,10 +25,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index f61d09ed382..c88c09d48b3 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -102,10 +102,6 @@ publishing {
         artifact sourcesJar
         artifact javadocJar
         artifact testJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index f77f329a5f1..3d1b7c34873 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -153,12 +153,6 @@ artifactoryPublish.skip = false
 publishing {
   publications {
     mavenJava(MavenPublication) {
-      if (release) {
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
-      }
       artifact zip
     }
   }
diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index 116afd59b8f..a2d0f1bb189 100644
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -53,10 +53,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-home/build.gradle b/sonar-home/build.gradle
index cc994082307..c4323e91133 100644
--- a/sonar-home/build.gradle
+++ b/sonar-home/build.gradle
@@ -26,10 +26,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-markdown/build.gradle b/sonar-markdown/build.gradle
index abbb5f8f042..ec958b2434c 100644
--- a/sonar-markdown/build.gradle
+++ b/sonar-markdown/build.gradle
@@ -26,10 +26,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-plugin-api/build.gradle b/sonar-plugin-api/build.gradle
index 778dc84f88f..047cf35b695 100644
--- a/sonar-plugin-api/build.gradle
+++ b/sonar-plugin-api/build.gradle
@@ -78,10 +78,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
index 3970816b0d0..c7d662c821d 100644
--- a/sonar-scanner-engine/build.gradle
+++ b/sonar-scanner-engine/build.gradle
@@ -60,10 +60,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-scanner-protocol/build.gradle b/sonar-scanner-protocol/build.gradle
index 999db37701b..788ab75e8c4 100644
--- a/sonar-scanner-protocol/build.gradle
+++ b/sonar-scanner-protocol/build.gradle
@@ -31,10 +31,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle
index 9cf1837d8f5..f6493bcca95 100644
--- a/sonar-testing-harness/build.gradle
+++ b/sonar-testing-harness/build.gradle
@@ -27,10 +27,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }
diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index 8b8f4c576e2..6f8aa851426 100644
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -37,10 +37,6 @@ publishing {
       if (release) {
         artifact sourcesJar
         artifact javadocJar
-        pom.withXml {
-          asNode().appendNode('description', description)
-          asNode().children().last() + pomConfig
-        }
       }
     }
   }