diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-02-20 18:32:45 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-02-20 18:33:03 +0100 |
| commit | 17a2fd51a13238eda003aed85249278253d8003f (patch) | |
| tree | 8cc026d58434c91d67fd0fd1459e0e675949b66c | |
| parent | 8597cda643dd8965c6c10e0b57a1ffce15885eb2 (diff) | |
| download | sonarqube-17a2fd51a13238eda003aed85249278253d8003f.tar.gz sonarqube-17a2fd51a13238eda003aed85249278253d8003f.zip | |
Fix compatibility with latest SNAPSHOT of sonar-update-center-common
3 files changed, 2 insertions, 2 deletions
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 55e82a58de9..951766731d0 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 @@ -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 Binary files differindex c772637d8db..f4b8b79b776 100644 --- 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 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 07c8f2de880..ec4139847cc 100644 --- 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; } } |