From 14482d1505786ea0ab76712e5c805f03057226de Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 16 Apr 2015 19:31:59 +0200
Subject: [PATCH] SONAR-6433 Stop supporting the concept of "group/ecosystem"
 of plugins

---
 pom.xml                                         |   2 +-
 .../PluginReferentialMetadataConverter.java     |   1 -
 .../app/views/updatecenter/available.html.erb   |  15 ---------------
 .../app/views/updatecenter/index.html.erb       |  15 ---------------
 .../core/plugins/DefaultPluginMetadata.java     |  16 +++++-----------
 .../sonar/core/plugins/PluginJarInstaller.java  |   1 -
 .../core/plugins/DefaultPluginMetadataTest.java |   3 +--
 .../core/plugins/PluginJarInstallerTest.java    |   8 --------
 .../sonar/core/plugins/fake1bis-plugin-1.0.jar  | Bin 2422 -> 0 bytes
 .../org/sonar/api/platform/PluginMetadata.java  |   7 +++++++
 10 files changed, 14 insertions(+), 54 deletions(-)
 delete mode 100644 sonar-core/src/test/resources/org/sonar/core/plugins/fake1bis-plugin-1.0.jar

diff --git a/pom.xml b/pom.xml
index 6ec2d1c6be8..264fa7aee2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
   </prerequisites>
 
   <properties>
-    <sonarUpdateCenter.version>1.11</sonarUpdateCenter.version>
+    <sonarUpdateCenter.version>1.13-SNAPSHOT</sonarUpdateCenter.version>
     <sonarJava.version>3.0</sonarJava.version>
     <sonarGit.version>1.0</sonarGit.version>
     <sonarSvn.version>1.0</sonarSvn.version>
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java
index 77e243e3377..30646c02a95 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java
@@ -63,7 +63,6 @@ public class PluginReferentialMetadataConverter {
     pluginManifest.setHomepage(metadata.getHomepage());
     pluginManifest.setIssueTrackerUrl(metadata.getIssueTrackerUrl());
     pluginManifest.setBasePlugin(metadata.getBasePlugin());
-    pluginManifest.setParent(metadata.getParent());
     pluginManifest.setRequirePlugins(metadata.getRequiredPlugins().toArray(new String []{}));
     return pluginManifest;
   }
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
index b3f462b6b02..3ffd2be1205 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
@@ -50,21 +50,6 @@
                 <div id="detail-<%= plugin.getKey() -%>" style="display:none">
                   <table class="spaced width100">
 
-                    <% index = 0 %>
-                    <% release.children.each do |child|
-                      child_plugin = child.artifact
-                    %>
-                      <tr>
-                        <% if index == 0 %>
-                          <td class="thin nowrap"><b>Includes:</b></td>
-                        <% else %>
-                          <td>&nbsp;</td>
-                        <% end %>
-                        <td><span><%= child_plugin.name -%></span> : <span><%= child_plugin.description -%></span></td>
-                      </tr>
-                      <% index = index + 1 %>
-                    <% end %>
-
                     <% release.outgoingDependencies.each_with_index do |outgoing_release, index| %>
                       <tr>
                         <% if index == 0 %>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
index 4b45615e091..aaf243c8278 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
@@ -41,21 +41,6 @@
 
                 <table class="spaced width100">
 
-                  <% index = 0 %>
-                  <% release.children.each do |child|
-                    child_plugin = @installed_plugin_referential.findPlugin(child.key)
-                  %>
-                    <tr>
-                      <% if index == 0 %>
-                        <td class="thin nowrap"><b>Includes:</b></td>
-                      <% else %>
-                        <td>&nbsp;</td>
-                      <% end %>
-                      <td><span><%= child_plugin.name -%></span> : <span><%= child_plugin.description -%></span></td>
-                    </tr>
-                    <% index = index + 1 %>
-                  <% end %>
-
                   <% release.outgoingDependencies.each_with_index do |outgoing_release, index| %>
                     <tr>
                       <% if index == 0 %>
diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
index 35cef375c33..9005f7a0917 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
@@ -50,7 +50,6 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
   private String basePlugin;
   private boolean core;
   private String implementationBuild;
-  private String parent;
   private List<String> requiredPlugins;
 
   private DefaultPluginMetadata() {
@@ -185,16 +184,6 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
     return this;
   }
 
-  @Override
-  public String getParent() {
-    return parent;
-  }
-
-  public DefaultPluginMetadata setParent(String parent) {
-    this.parent = parent;
-    return this;
-  }
-
   @Override
   public List<String> getRequiredPlugins() {
     return ImmutableList.copyOf(requiredPlugins);
@@ -283,6 +272,11 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
     return this;
   }
 
+  @Override
+  public String getParent() {
+    return null;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/PluginJarInstaller.java b/sonar-core/src/main/java/org/sonar/core/plugins/PluginJarInstaller.java
index 0f9a06d8e22..301410df775 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginJarInstaller.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginJarInstaller.java
@@ -78,7 +78,6 @@ public abstract class PluginJarInstaller implements BatchComponent, ServerCompon
       metadata.setUseChildFirstClassLoader(manifest.isUseChildFirstClassLoader());
       metadata.setBasePlugin(manifest.getBasePlugin());
       metadata.setImplementationBuild(manifest.getImplementationBuild());
-      metadata.setParent(manifest.getParent());
       metadata.setRequiredPlugins(Arrays.asList(manifest.getRequirePlugins()));
       metadata.setCore(isCore);
       return metadata;
diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java b/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
index f738ada38c7..98cdf2698b6 100644
--- a/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
@@ -36,7 +36,6 @@ public class DefaultPluginMetadataTest {
   public void testGettersAndSetters() {
     DefaultPluginMetadata metadata = DefaultPluginMetadata.create(new File("sonar-checkstyle-plugin.jar"));
     metadata.setKey("checkstyle")
-      .setParent("java")
       .setLicense("LGPL")
       .setDescription("description")
       .setHomepage("http://home")
@@ -51,7 +50,7 @@ public class DefaultPluginMetadataTest {
       .setImplementationBuild("abcdef");
 
     assertThat(metadata.getKey()).isEqualTo("checkstyle");
-    assertThat(metadata.getParent()).isEqualTo("java");
+    assertThat(metadata.getParent()).isNull();
     assertThat(metadata.getLicense()).isEqualTo("LGPL");
     assertThat(metadata.getDescription()).isEqualTo("description");
     assertThat(metadata.getHomepage()).isEqualTo("http://home");
diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/PluginJarInstallerTest.java b/sonar-core/src/test/java/org/sonar/core/plugins/PluginJarInstallerTest.java
index 3fc177f99d4..b66bf864085 100644
--- a/sonar-core/src/test/java/org/sonar/core/plugins/PluginJarInstallerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/plugins/PluginJarInstallerTest.java
@@ -81,14 +81,6 @@ public class PluginJarInstallerTest {
     assertThat(metadata.getBasePlugin()).isEqualTo("checkstyle");
   }
 
-  @Test
-  public void should_extract_parent_information() throws IOException {
-    DefaultPluginMetadata metadata = extractor.extractMetadata(getFileFromCache("fake1bis-plugin-1.0.jar"), true);
-
-    assertThat(metadata.getKey()).isEqualTo("fake1bis");
-    assertThat(metadata.getParent()).isEqualTo("fake1");
-  }
-
   @Test
   public void should_extract_requires_plugin_information() throws IOException {
     DefaultPluginMetadata metadata = extractor.extractMetadata(getFileFromCache("fake2-plugin-1.1.jar"), true);
diff --git a/sonar-core/src/test/resources/org/sonar/core/plugins/fake1bis-plugin-1.0.jar b/sonar-core/src/test/resources/org/sonar/core/plugins/fake1bis-plugin-1.0.jar
deleted file mode 100644
index b2323cc388b4086285a5fe3f4762952b0b5282a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2422
zcmWIWW@h1H0D;!9ASW;bN^k;cU)K;vT~9wZ{Q#&k4u%$>vZ#rRPpdF8Fc>j0Fo+;4
z^L6y|baM?3(ergHo#^d<*g&A={lri5HSR0txH&wHmUr62B`UHmqj1~Wm9Jaw?qI63
z&70M>Md*6|o4GUZYFcb|ST`wL#jG`0>Fr4isY!7&buY=!i~RFRhtEl-mviAE8_8O2
zLmkKU0X~V{dVOy9ZmfDHe^07JY>r!WNVTee-si99o-I<pzv;BatjPT)dXmuzVUM`3
z&FJHKpSk*;LG>Kr7p9lEBUPiGPMo&zFn@^Rv;SV~_6OLc=a(PWt<$r~eDYYZ^nvG#
zl`iqiB9(r7TFqD<H23>dnK>szPJMg(kxkm-VD5@Iww1=EO>0h0`5jX#ASl&6`Bb@t
z*$#_dOJ=8VQz!5Dy>7>EeB7aD7IA1(_cIS^IdMI6>*vmwpC593elAi!+ur8ka`Tq6
zy06#@zi^|5s_62cGo*l_x(tXxq3V{HooeWmSsaj4nx2`bmz<MWTpSx<3kucRyvr>u
zOLR3^4L5D&>9uN>Sn)zcamk{0c^jGz_O3qS_+fnlli>&EAAua!yz)m6@7-Pg{_fmA
zAAf%1OX#WP7uzLQCSdi#@`maL|B7Q*H64o$<_Jd!SDxjtGCY67b!W_mKV5n)X@?@z
zLe6BK^NpQ6ZP!CqNAr1?tj+8mA6=>uJWp1bMKkz0e^)B&^qJFIniFfh-)Dws=`ETe
z?$y0#rq1UU-<>nB-kxJ<lqIiwgYTE!Hvxey=Bh00M*fSP(oFhabh#T(uKoUN|7*1%
zj%h2ts_I3ryRvvELwm-n{|4(BlfquUc%gO4!(>}uoWs1;-=_7Ix!x)${c@eD;>I<P
z64@)y0&};;U99-^y!3y?TKW9lL8bc`U}1@wkol2QXl`OzY92f}V=C6bRGgfjt5=+#
zmsnJsUs{x$s+U;;;o>pHf&^32K+&9(S*%+Cj%T>391K3dthRFgoztwqZ05_#z+g{-
zsRck!ROIGN4T;actsql#etANjxrMj7@5IMi*`m2ov!lGsd{?dNN_w>6SOTNprF?sy
zf6bFauHHLSIOl!&9NBpJZrK~bD`z~|oWQe~A;8b&ScM&T-CFU7*B@9(9$hL@uX*vn
zhMlumqt~9+bYi_1%vacXa+;H3@f5o|i?t=LYE84W)w;Hkzn$5}N9TR9Nbkk@zjsfy
zjCe4iaH*mCl{rB<t8^;VIj&v1(yq_^-cU#2-THZppL58Cim50wJaS4Y`F^{1PDG;w
z?}k|+NuE2`$)8o4zDTP+g;S6<q$zo&iz;WU&+gQosJ6$+D{rz1=Qb3DKTX>sQ8`1|
zbfLQ1=Yp+smal%#|61a$E&mErL#eF158AT(4MeRz2IoGWyC-S$MD=U2?yo=2I$G#B
z`N~b^%bF2aRy~k5j(dA8<Hg0zVeeD6EU_^TO$;$*F1;|DdC!A0sSd$fyN*uXC2_OB
z;eJ_%ciFso&vTj7n{T{&&=$65YiYEzzUb|(<`?e-E`M|F?Wh08c361Ku71H)`SX_F
zF{#7))3Yyrco7&Jm#lSh(;~x94f9-C?r+#L>09utk9jBNe_6YFvZhD-T;u7b>SF3w
zQiG=m=e?@RZjH`*RU5$k=`5f2(<#0`FKt_W@7~Xu(W^RAmda}V`%+PC9e-YaHxsk^
zr!P~sSlR6tXRh^okreRu<F>H4z@#fCCl<WBKcnX#BP^>x3v+Ynx5dDeRRzRu6sE9(
zqWpr?qLR$iV%1XzxegidFkGnKue9N_m$l%r1ogm=8)n;2D7&eVWpt@*!~XCOKOUHt
zCk5%4I9ntfntQ`!vcVmVhW7_|KfJ@cuKn~^&bgn}H&1@1VpH|{%&MU6$8Fqx-q7ip
zwKPj*_Nn=7TbHmV|D4Mj|HS#!+i&Z#lRmQscr!AIFypSwfPMo40fx7ZAR4J^gK5KF
zxq%dez>-FFAPLuoRMjCYhM0g}kb|{@O{fJH?bwQSgbA1>5~%os00D;o|4)L-0$8mK
zE6iXXz|;&X&JdcvVQR)xxZySxRJ<WfwPD6^5>8Vw3p<!C*o!-uJxdxVQD6(S@I!<$
l_LPsX><h58MGIx3y#%rhkq-jAS=m75asc5}VDO&?^8gX|XVw4!

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/PluginMetadata.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/PluginMetadata.java
index 29a84f84a53..2afd2312c3c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/PluginMetadata.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/PluginMetadata.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.api.platform;
 
+import javax.annotation.CheckForNull;
 import java.io.File;
 import java.util.List;
 
@@ -57,6 +58,12 @@ public interface PluginMetadata {
 
   String getBasePlugin();
 
+  /**
+   * Always return <code>null</code> since version 5.2
+   * @deprecated in 5.2. Concept of parent relationship is removed. See https://jira.codehaus.org/browse/SONAR-6433
+   */
+  @Deprecated
+  @CheckForNull
   String getParent();
 
   List<String> getRequiredPlugins();
-- 
2.39.5