Fix compatibility with latest SNAPSHOT of sonar-update-center-common

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 55e82a58de9a5e4d77e5b433983e0ab923a722ca..951766731d08cd60bfd33f6069eafa124c4bb44b 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
@@ -121,7 +121,7 @@ public class PluginInstaller {
       metadata.setBasePlugin(manifest.getBasePlugin());
       metadata.setImplementationBuild(manifest.getImplementationBuild());
       metadata.setParent(manifest.getParent());
-      metadata.setRequiredPlugins(Arrays.asList(manifest.getRequiresPlugins()));
+      metadata.setRequiredPlugins(Arrays.asList(manifest.getRequirePlugins()));
       metadata.setCore(isCore);
       return metadata;
 

diff --git a/sonar-core/src/test/resources/org/sonar/core/plugins/fake2-plugin-1.1.jar b/sonar-core/src/test/resources/org/sonar/core/plugins/fake2-plugin-1.1.jar
index c772637d8dbd60329fbe33994a8c4fc1bd4b7aa6..f4b8b79b77622d8abb276d086042d04bb87e52e3 100644 (file)
Binary files a/sonar-core/src/test/resources/org/sonar/core/plugins/fake2-plugin-1.1.jar and b/sonar-core/src/test/resources/org/sonar/core/plugins/fake2-plugin-1.1.jar differ

diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java b/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java
index 07c8f2de8801a815e5520c9b8e3672bc32001b5a..ec4139847cca88011d811b3abb407fb8f5e04100 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java
@@ -63,7 +63,7 @@ public class PluginReferentialMetadataConverter {
     pluginManifest.setHomepage(metadata.getHomepage());
     pluginManifest.setBasePlugin(metadata.getBasePlugin());
     pluginManifest.setParent(metadata.getParent());
-    pluginManifest.setRequiresPlugins(metadata.getRequiredPlugins().toArray(new String []{}));
+    pluginManifest.setRequirePlugins(metadata.getRequiredPlugins().toArray(new String []{}));
     return pluginManifest;
   }
 }