Revert "SONAR-3976 Introduce the concept of plugin group"

This reverts commit e1bccb1b2268d6b2bd809c6699e4e96f832c513d.

3 files changed, 0 insertions, 13 deletions

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 bc08a0b8d63..f08e78de9a4 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
@@ -35,7 +35,6 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
   private List<File> deprecatedExtensions = Lists.newArrayList();
   private String[] pathsToInternalDeps = new String[0];
   private String key;
-  private String group;
   private String version;
   private String sonarVersion;
   private String name;
@@ -107,15 +106,6 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
     return this;
   }
 
-  public String getGroup() {
-    return group != null ? group : key;
-  }
-
-  public DefaultPluginMetadata setGroup(String group) {
-    this.group = group;
-    return this;
-  }
-
   public String getName() {
     return name;
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java b/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
index 4c988493080..117011a9a42 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
@@ -106,7 +106,6 @@ public class PluginInstaller {
       PluginManifest manifest = new PluginManifest(file);
       DefaultPluginMetadata metadata = DefaultPluginMetadata.create(file);
       metadata.setKey(manifest.getKey());
-      metadata.setGroup(manifest.getGroup());
       metadata.setName(manifest.getName());
       metadata.setDescription(manifest.getDescription());
       metadata.setLicense(manifest.getLicense());
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 0ddc9e37722..0714f5bdf23 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
@@ -35,7 +35,6 @@ public class DefaultPluginMetadataTest {
   public void testGettersAndSetters() {
     DefaultPluginMetadata metadata = DefaultPluginMetadata.create(new File("sonar-checkstyle-plugin.jar"));
     metadata.setKey("checkstyle")
-        .setGroup("java")
         .setLicense("LGPL")
         .setDescription("description")
         .setHomepage("http://home")
@@ -49,7 +48,6 @@ public class DefaultPluginMetadataTest {
         .setImplementationBuild("abcdef");
 
     assertThat(metadata.getKey()).isEqualTo("checkstyle");
-    assertThat(metadata.getGroup()).isEqualTo("java");
     assertThat(metadata.getLicense()).isEqualTo("LGPL");
     assertThat(metadata.getDescription()).isEqualTo("description");
     assertThat(metadata.getHomepage()).isEqualTo("http://home");