From 17a2fd51a13238eda003aed85249278253d8003f Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Wed, 20 Feb 2013 18:32:45 +0100
Subject: [PATCH] Fix compatibility with latest SNAPSHOT of
 sonar-update-center-common

---
 .../sonar/core/plugins/PluginInstaller.java   |   2 +-
 .../sonar/core/plugins/fake2-plugin-1.1.jar   | Bin 2385 -> 2673 bytes
 .../PluginReferentialMetadataConverter.java   |   2 +-
 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
index c772637d8dbd60329fbe33994a8c4fc1bd4b7aa6..f4b8b79b77622d8abb276d086042d04bb87e52e3 100644
GIT binary patch
delta 1258
zcmca8^ijk<z?+#xgn<JHTf>5!7?6M<g8+kDVs@%gKu&3TW}aShPGWI!Xao<#H8$12
zQ$H00zcPw2Y+k`A&REaR@ps*pBvD2NhPgltGLj2y5ZB}o6eBr-M*6yjIO=-(x#@$9
zIs!Bbgh56jT*8N@O$1q+ucM!*n`>~0p069sG4*GlMwCwU_CIVO(DHubC;1xpm2X`3
z)Vy}?2w%9UQ9H`=_LVE8hphS<;{9iBQCxfE;{6I+<JXoEd!52v^F92;!;B0cB^s!0
zy=HnzK2GA#r#{&hgBe0jt&t`_r{%;nMJdmA?lt34i<`absr<c+Eo^I?f<xv`a{YcY
zExo?j@X`B|sS-Lp=ePDQW1BPi4V#%n`HJc9=6s$Zw1W4Nw&cmGr!zk-JHQ{}d+h&I
z#=0imcfM8IbZj(Bj(^U*5_vgb(~NGFM};cuf(|~d)cN^UQhd($a`xTAwsR8iPSKOj
z{P2oru2O8-!doJ5mb_**tB#g^8qKh9t>4SVVHvV~a#s6ww?#PFxoBRx=F2_%<=m$W
zA8p!T@Z(m>lrPNsKVF(9mKV)kJ|TC#!4K8|Z+4DHmsFQ30OLuQiGg8)lrleZ=;kJt
zrRKq-<_t8JCrB}CFbGUuz^o|%i#3?kWCLayMv#=5F1i#VLeZ0!GuSXIse+>Xg4Cjt
z%v6kYHQ9-+NSmEQzJ<-M0GO1@ff!+2I$BD#0UKuvb{i;hPJ$)QyUc7%;_Mt^zGqul
zfS&bd1)0LgB+3j-@sk@EMeBKB>D^&TBZ!G5y>r0RJ47q4l#MXztz!x>bdl0I2Rxm_
zZ3pHzU@CWYLXHa&280<)8fPP$fs*JUE&`=_h;fq-GD#RBv>tHeWk#|d7NZbHfT9hq
zOH4om$;tzcUd)r{GiwQjMqpKIilTM_NUgaArdmW{f*g6yNSc>4GP3|RTRR~~KYB1j
oi~+?oa_rfl81n^WjGYq54X|hr@MdKLMI@*|dkKv4B6biD0602Yc>n+a

delta 877
zcmew;a#3jV0%j?DP6h@BU)K;vT~9wZ{Qz%f7A~Lw2SaOEkkjh7)g=my3=Dcq3=AU3
z%6uLDJl$M_L-c&zCf{Y0tZ&thvb=rmO6j4z7{>kcCR~^h_UJ|ao_RCBitLG13O~s$
zbo)^DLN=qmwv=mS?O)o{`Rtjx_X@ZtJFPJAcbgx@<86>F5`1G}|Kh+6>#}}C7l`d;
z&c7fUy86k<+<iYcT1ua|{>G*+O>fN_|6_bJw(e-+U8ehLiS)AuZl=wSRcg!YU6<Qj
zTBY}aHFWOB`lapi3ElhEWM_*v@_c$&BU~C}enn}jmUqgm72U0qewkeT^vOj_bNBAO
zcUSWH6@*XM%U=2Y70b;Dy0-&-xeBj*<$JwXm;ck*h6~}xzuc4h(zEyY`flB68(uAD
zy)^B3>-o3+Pxn3A^WnnpTR9U-nf-sr=_qcuaL@Cdn%8yoqB&~#{av>uNfa1<bAeb8
z7=CVv*{MbWIi=~Dd3wn?iN(bm?Zp`<FJhJu=0^_Q+{CifJbh5)FljJM7Ua?bGG&0Y
zxeUVibYS#|`JQcI0Y;5KD+7ZKNTJ>4I94_$R&W$fF60yi3RzD+&&f5pgr$gukx7Jk
zvLLfqJt)E<K!D+`BZ!3*{UBAi697~n!;(gIWNk>vA;25e1oR+aU{Hn_vZS#R7%CVc
z0?`k2r-UlZG69DF|MvpD33nwVeBdg@1T<hu89-`ZF@eI24N2Y<Mcx1y3|!_q$S%bU
qO}GxAUz<T1>^R{XKtaogtl%LlETqK(yjj^mQXD|o33T)(Fb@EiH2zQk

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;
   }
 }
-- 
2.39.5