From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 16 Apr 2015 17:31:59 +0000 (+0200)
Subject: SONAR-6433 Stop supporting the concept of "group/ecosystem" of plugins
X-Git-Tag: 5.2-RC1~2205
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14482d1505786ea0ab76712e5c805f03057226de;p=sonarqube.git

SONAR-6433 Stop supporting the concept of "group/ecosystem" of plugins
---

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 b2323cc388b..00000000000
Binary files a/sonar-core/src/test/resources/org/sonar/core/plugins/fake1bis-plugin-1.0.jar and /dev/null differ
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();