From 432ceb89f4b9266b30d038ab3159cf451d9cae6c Mon Sep 17 00:00:00 2001
From: Elena Vilchik <vilchik.elena@gmail.com>
Date: Mon, 20 Feb 2017 11:51:32 +0100
Subject: [PATCH] Various improvements to pom files (#490)

* Update developers' list in pom file

* SONARJS-919 Update pom: remove Organization URL

* Add 'SonarQube' to modules' names

* Update parent pom to 39
---
 javascript-checks-testkit/pom.xml |  2 +-
 javascript-checks/pom.xml         |  2 +-
 javascript-frontend/pom.xml       |  2 +-
 pom.xml                           | 34 ++++++++++++++++---------------
 sonar-javascript-plugin/pom.xml   |  3 ++-
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/javascript-checks-testkit/pom.xml b/javascript-checks-testkit/pom.xml
index 4dc0184ac54..4ed437bcdac 100644
--- a/javascript-checks-testkit/pom.xml
+++ b/javascript-checks-testkit/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>javascript-checks-testkit</artifactId>
-  <name>JavaScript :: Check Test Toolkit</name>
+  <name>SonarQube JavaScript :: Check Test Toolkit</name>
 
   <dependencies>
     <dependency>
diff --git a/javascript-checks/pom.xml b/javascript-checks/pom.xml
index a974eea2b22..31dfc6ca2ea 100644
--- a/javascript-checks/pom.xml
+++ b/javascript-checks/pom.xml
@@ -10,7 +10,7 @@
 
   <artifactId>javascript-checks</artifactId>
 
-  <name>JavaScript :: Checks</name>
+  <name>SonarQube JavaScript :: Checks</name>
 
   <dependencies>
     <dependency>
diff --git a/javascript-frontend/pom.xml b/javascript-frontend/pom.xml
index 56154a1d8a7..4eafdb3d4c9 100644
--- a/javascript-frontend/pom.xml
+++ b/javascript-frontend/pom.xml
@@ -10,7 +10,7 @@
 
   <artifactId>javascript-frontend</artifactId>
 
-  <name>JavaScript :: Frontend</name>
+  <name>SonarQube JavaScript :: Frontend</name>
 
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 71737546755..6d679679e36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,7 @@
   <parent>
     <groupId>org.sonarsource.parent</groupId>
     <artifactId>parent</artifactId>
-    <!--
-     When updating to parent 38 or above, check if <version.sonar-packaging.plugin> defined in the new
-     parent is 1.17 or above. If it is, remove the temporary override of <version.sonar-packaging.plugin>
-     below in this file.
-    -->
-    <version>38</version>
+    <version>39</version>
   </parent>
 
   <groupId>org.sonarsource.javascript</groupId>
@@ -18,12 +13,11 @@
   <version>2.21-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>JavaScript</name>
-  <description>Enables scanning of JavaScript source files</description>
+  <name>SonarQube JavaScript</name>
+  <description>SonarQube JavaScript Analyzer</description>
   <inceptionYear>2011</inceptionYear>
   <organization>
     <name>SonarSource and Eriks Nukis</name>
-    <url>http://www.sonarsource.com</url>
   </organization>
   <licenses>
     <license>
@@ -35,13 +29,23 @@
 
   <developers>
     <developer>
-      <id>eriks.nukis</id>
-      <name>Eriks Nukis</name>
-      <url>https://profiles.google.com/eriks.nukis</url>
+      <id>inverno</id>
+      <name>Carlo Bottiglieri</name>
+      <organization>SonarSource</organization>
+    </developer>
+    <developer>
+      <id>ivandalbosco</id>
+      <name>Yves Dubois-Pèlerin</name>
+      <organization>SonarSource</organization>
+    </developer>
+    <developer>
+      <id>pynicolas</id>
+      <name>Pierre-Yves Nicolas</name>
+      <organization>SonarSource</organization>
     </developer>
     <developer>
-      <id>godin</id>
-      <name>Evgeny Mandrikov</name>
+      <id>vilchik-elena</id>
+      <name>Elena Vilchik</name>
       <organization>SonarSource</organization>
     </developer>
   </developers>
@@ -73,8 +77,6 @@
     <license.title>SonarQube JavaScript Plugin</license.title>
     <!-- depends on API 6.0 but backward compatible with LTS -->
     <sonarQubeMinVersion>5.6</sonarQubeMinVersion>
-    <!-- Temporary override of plugin version 1.16 inherited from parent 37 -->
-    <version.sonar-packaging.plugin>1.17</version.sonar-packaging.plugin>
 
     <assertj.version>3.5.2</assertj.version>
     <commons-io.version>2.5</commons-io.version>
diff --git a/sonar-javascript-plugin/pom.xml b/sonar-javascript-plugin/pom.xml
index 8c5ddc7dc74..782df2a496a 100644
--- a/sonar-javascript-plugin/pom.xml
+++ b/sonar-javascript-plugin/pom.xml
@@ -11,7 +11,7 @@
   <artifactId>sonar-javascript-plugin</artifactId>
   <packaging>sonar-plugin</packaging>
 
-  <name>JavaScript :: Sonar Plugin</name>
+  <name>SonarQube JavaScript :: Plugin</name>
   <!-- Be careful when altering <description> as its value shows up in the SonarQube GUI -->
   <description>Code Analyzer for JavaScript</description>
   <url>http://redirect.sonarsource.com/plugins/javascript.html</url>
@@ -65,6 +65,7 @@
         <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
         <configuration>
+          <!-- This value shows up in the SonarQube GUI -->
           <pluginName>SonarJS</pluginName>
           <pluginClass>org.sonar.plugins.javascript.JavaScriptPlugin</pluginClass>
           <skipDependenciesPackaging>true</skipDependenciesPackaging>